sysdig: update to 0.27.1.

Closes #24830.
This commit is contained in:
Leah Neukirchen 2020-10-05 10:25:09 +02:00
parent f0b7f7ccd9
commit c1b6f11bc1
3 changed files with 21 additions and 47 deletions

View file

@ -1,40 +0,0 @@
--- 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
//
--- 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

@ -0,0 +1,14 @@
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -68,11 +68,6 @@
set(MINIMAL_BUILD_FLAGS "-DMINIMAL_BUILD")
endif()
-if(MUSL_OPTIMIZED_BUILD)
- set(SYSDIG_MUSL_FLAGS "-static -Os")
-endif()
-
-
if(NOT WIN32)
set(SYSDIG_DEBUG_FLAGS "-D_DEBUG")

View file

@ -1,8 +1,7 @@
# Template file for 'sysdig'
pkgname=sysdig
version=0.27.0
revision=3
archs="i686 x86_64 ppc64le"
version=0.27.1
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
@ -19,19 +18,20 @@ license="Apache-2.0, MIT, GPL-2.0-only"
homepage="http://www.sysdig.org/"
changelog="https://github.com/draios/sysdig/releases"
distfiles="https://github.com/draios/${pkgname}/archive/${version}.tar.gz"
checksum=a67f97b2620e3d9c5d48d07932604c938a5a6d3b625d7a23bfb2eb9802024b52
checksum=b9d05854493d245a7a7e75f77fc654508f720aab5e5e8a3a932bd8eb54e49bda
disable_parallel_build=yes
dkms_modules="sysdig ${version}"
nocross=yes
case "$XBPS_TARGET_MACHINE" in
*-musl) configure_args+=" -DMUSL_OPTIMIZED_BUILD=On"
esac
# Avoid excessive warnings spam to the log
CXXFLAGS="-Wno-deprecated-declarations"
post_extract() {
sed -i 's,"${DIR_ETC}/bash_completion.d",share/bash-completion/completions,g' scripts/CMakeLists.txt
sed -i '1i#include <sys/select.h>' userspace/libsinsp/mesos_collector.h
sed -i '1i#include <sys/sysmacros.h>' userspace/libscap/scap_fds.c
sed -i '1iset(CMAKE_EXE_LINKER_FLAGS "-ltbb -lcurl")' CMakeLists.txt
}