diff options
| author | Oleg Pykhalov <go.wigust@gmail.com> | 2020-05-12 01:22:17 +0300 |
|---|---|---|
| committer | Oleg Pykhalov <go.wigust@gmail.com> | 2020-05-12 01:22:17 +0300 |
| commit | bcb31c5f7b387479383cfd7d313faf5c3a92d1d0 (patch) | |
| tree | 95b8acb156b2e399752d80a7beabed42d36ed060 | |
| parent | w (diff) | |
| download | guix-wigust-bcb31c5f7b387479383cfd7d313faf5c3a92d1d0.tar.gz | |
gnu: Add sysdig.
* guix/sysdig-docker-fix.patch (sysdig): New variable.
| -rw-r--r-- | guix/sysdig-docker-fix.patch | 22 | ||||
| -rw-r--r-- | guix/wigust/packages/sysdig.scm | 35 |
2 files changed, 47 insertions, 10 deletions
diff --git a/guix/sysdig-docker-fix.patch b/guix/sysdig-docker-fix.patch new file mode 100644 index 0000000..dbbb07c --- /dev/null +++ b/guix/sysdig-docker-fix.patch @@ -0,0 +1,22 @@ +--- a/userspace/libsinsp/cgroup_list_counter.h 1970-01-01 03:00:01.000000000 +0300 ++++ b/userspace/libsinsp/cgroup_list_counter.h 2020-05-12 00:30:14.955322314 +0300 +@@ -83,7 +83,7 @@ + static int process_number(const char *section_start, const char *section_end) + { + std::string section(section_start, section_end - section_start); +- return std::stoi(section.c_str()); ++ return 1; + + } + +--- a/userspace/libsinsp/value_parser.cpp 1970-01-01 03:00:01.000000000 +0300 ++++ b/userspace/libsinsp/value_parser.cpp 2020-05-12 01:06:35.093025527 +0300 +@@ -70,7 +70,7 @@ + // if the string is made only of numbers + if(strspn(in.c_str(), "0123456789") == in.size()) + { +- *(uint16_t*)storage = stoi(in); ++ *(uint16_t*)storage = 1; + } + else + { diff --git a/guix/wigust/packages/sysdig.scm b/guix/wigust/packages/sysdig.scm index d6c7aa7..d443ee6 100644 --- a/guix/wigust/packages/sysdig.scm +++ b/guix/wigust/packages/sysdig.scm @@ -17,6 +17,7 @@ ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. (define-module (wigust packages sysdig) + #:use-module (gnu packages) #:use-module (guix packages) #:use-module (guix git-download) #:use-module (guix download) @@ -96,13 +97,23 @@ (base32 "153g9dmgcnzx12kn6wg30g25bxsqzsvr5xyg1l5180i37n16fi3r")) (patches - (list (origin - (method url-fetch) - (uri "https://git.archlinux.org/svntogit/community.git/plain/trunk/glibc.patch?h=packages/sysdig") - (file-name "sysdig-fix-scap_fds.patch") - (sha256 - (base32 - "0fbrcg4pq56ji9y1rfsxy7jsmnhy8aapx9znkiqc7d8ca0ayg7lx"))))))) + (append #;'() (search-patches "sysdig-docker-fix.patch") + (list (origin + (method url-fetch) + (uri "https://git.archlinux.org/svntogit/community.git/plain/trunk/glibc.patch?h=packages/sysdig") + (file-name "sysdig-fix-scap_fds.patch") + (sha256 + (base32 + "0fbrcg4pq56ji9y1rfsxy7jsmnhy8aapx9znkiqc7d8ca0ayg7lx"))))))) + #;(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/draios/sysdig.git") + (commit ""))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "253g9dmgcnzx12kn6wg30g25bxsqzsvr5xyg1l5180i37n16fi3r")))) (build-system cmake-build-system) (inputs `(;; ("pkg-config" ,pkg-config) @@ -123,15 +134,19 @@ ("grpc" ,grpc) )) ;; (native-inputs - ;; `(("gcc" ,gcc-4.8))) + ;; `(("gcc" ,gcc-10))) (arguments - `(#:configure-flags `("-DCMAKE_BUILD_TYPE=Release" + `(#:parallel-build? #f + #:tests? #f + #:configure-flags `("-DCMAKE_BUILD_TYPE=Release" "-DCREATE_TEST_TARGETS=OFF" "-DUSE_BUNDLED_DEPS=OFF" ;unbundle the dependencies "-DBUILD_DRIVER=OFF" "-DBUILD_LIBSCAP_EXAMPLES=OFF" ;libscap examples are not installed "-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON" - + "-DCMAKE_C_FLAGS=-Wno-deprecated-declarations" + "-DCMAKE_CXX_FLAGS=-Wno-deprecated-declarations" + ;; "-DUSE_BUNDLED_JSONCPP=OFF" ;; "-DCMAKE_EXE_LINKER_FLAGS=\"-ltbb -lcurl\"" ;; "-DluaL_reg=luaL_Reg -DluaL_getn(L,i)=((int)lua_objlen(L,i))" ) |