From df277dd9cdf33687e6657d7446cffed381f545b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 7 Nov 2015 17:24:52 +0100 Subject: [PATCH] sysdig: unbreak musl --- srcpkgs/sysdig/patches/musl-execinfo.patch | 41 ++++++++++++++++++++++ srcpkgs/sysdig/patches/musl-fd_set.patch | 18 ++++++++++ srcpkgs/sysdig/template | 2 +- 3 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/sysdig/patches/musl-execinfo.patch create mode 100644 srcpkgs/sysdig/patches/musl-fd_set.patch diff --git a/srcpkgs/sysdig/patches/musl-execinfo.patch b/srcpkgs/sysdig/patches/musl-execinfo.patch new file mode 100644 index 00000000000..109b826cd22 --- /dev/null +++ b/srcpkgs/sysdig/patches/musl-execinfo.patch @@ -0,0 +1,41 @@ +--- userspace/libsinsp/utils.cpp 2015-11-06 23:42:21.000000000 +0100 ++++ userspace/libsinsp/utils.cpp 2015-11-07 17:16:50.225795163 +0100 +@@ -21,7 +21,9 @@ + #include + #include + #include ++#if defined(__GLIBC__) + #include ++#endif + #include + #include + #include +@@ -741,7 +743,7 @@ + return tv.tv_sec * (uint64_t) 1000000000 + tv.tv_usec * 1000; + } + +-#ifndef _WIN32 ++#if !defined(_WIN32) && defined(__GLIBC__) + void sinsp_utils::bt(void) + { + static const char start[] = "BACKTRACE ------------"; +@@ -763,7 +765,7 @@ + + free(bt_syms); + } +-#endif // _WIN32 ++#endif // !defined(_WIN32) && defined(__GLIBC__) + + /////////////////////////////////////////////////////////////////////////////// + // gettimeofday() windows implementation +--- userspace/libsinsp/utils.h 2015-11-06 23:42:21.000000000 +0100 ++++ userspace/libsinsp/utils.h 2015-11-07 17:17:34.171798332 +0100 +@@ -79,7 +79,7 @@ + + static uint64_t get_current_time_ns(); + +-#ifndef _WIN32 ++#if !defined(_WIN32) && defined(__GLIBC__) + // + // Print the call stack + // diff --git a/srcpkgs/sysdig/patches/musl-fd_set.patch b/srcpkgs/sysdig/patches/musl-fd_set.patch new file mode 100644 index 00000000000..9d1cd33115d --- /dev/null +++ b/srcpkgs/sysdig/patches/musl-fd_set.patch @@ -0,0 +1,18 @@ + +--- userspace/libsinsp/k8s_collector.h 2015-11-06 23:42:21.000000000 +0100 ++++ userspace/libsinsp/k8s_collector.h 2015-11-07 17:14:06.891783388 +0100 +@@ -7,6 +7,7 @@ + #include "k8s_common.h" + #include + #include ++#include + + class k8s_http; + +@@ -49,4 +50,4 @@ + inline void k8s_collector::stop() + { + m_stopped = true; +-} +\ Kein Zeilenumbruch am Dateiende. ++} diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template index 7382195eb97..1c62ab95128 100644 --- a/srcpkgs/sysdig/template +++ b/srcpkgs/sysdig/template @@ -1,7 +1,7 @@ # Template file for 'sysdig' pkgname=sysdig version=0.5.0 -revision=1 +revision=2 build_style=cmake configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF -DUSE_BUNDLED_B64=ON -DBUILD_DRIVER=OFF"