sysdig: unbreak musl

This commit is contained in:
Jürgen Buchmüller 2015-11-07 17:24:52 +01:00
parent dc45a6da2f
commit df277dd9cd
3 changed files with 60 additions and 1 deletions

View File

@ -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 <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 @@
static uint64_t get_current_time_ns();
-#ifndef _WIN32
+#if !defined(_WIN32) && defined(__GLIBC__)
//
// Print the call stack
//

View File

@ -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 <map>
#include <atomic>
+#include <sys/select.h>
class k8s_http;
@@ -49,4 +50,4 @@
inline void k8s_collector::stop()
{
m_stopped = true;
-}
\ Kein Zeilenumbruch am Dateiende.
+}

View File

@ -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"