sysdig: update to 0.21.0.

This commit is contained in:
Leah Neukirchen 2018-03-30 17:59:23 +02:00
parent 016a01c974
commit f7502ccf89
2 changed files with 32 additions and 33 deletions

View File

@ -1,33 +1,3 @@
--- 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 <limits.h>
#include <stdlib.h>
#include <sys/time.h>
+#if defined(__GLIBC__)
#include <execinfo.h>
+#endif
#include <unistd.h>
#include <sys/time.h>
#include <netdb.h>
@@ -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 @@
@ -39,3 +9,32 @@
//
// Print the call stack
//
--- userspace/libsinsp/utils.cpp.orig
+++ userspace/libsinsp/utils.cpp
@@ -21,7 +21,7 @@
#include <limits.h>
#include <stdlib.h>
#include <sys/time.h>
-#ifndef CYGWING_AGENT
+#ifndef __GLIBC__
#include <execinfo.h>
#endif
#include <unistd.h>
@@ -770,7 +770,7 @@
#endif
}
-#ifndef CYGWING_AGENT
+#ifndef __GLIBC__
#ifndef _WIN32
void sinsp_utils::bt(void)
{
@@ -893,7 +893,7 @@
return 0;
}
-#endif // _WIN32
+#endif // !defined(_WIN32) && defined(__GLIBC__)
///////////////////////////////////////////////////////////////////////////////
// gethostname wrapper

View File

@ -1,7 +1,7 @@
# Template file for 'sysdig'
pkgname=sysdig
version=0.20.0
revision=2
version=0.21.0
revision=1
build_style=cmake
configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
-DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF"
@ -17,7 +17,7 @@ license="GPL-2"
homepage="http://www.sysdig.org/"
_changelog="https://github.com/draios/sysdig/releases"
distfiles="https://github.com/draios/${pkgname}/archive/${version}.tar.gz"
checksum=e1f7e824831a9b902f6df0e818c41bdfc21175398d58318d7892df9c601e7e96
checksum=3ba35ca1e84dd4487bdeff078ff0e48c862fa6887688f9c8d4a076865c6f9a05
nocross=yes
disable_parallel_build=yes
only_for_archs="i686 x86_64"