From 69ad10bd3d6c44f1119994dbaf6337c00636e341 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Fri, 20 Dec 2019 01:18:06 +0100 Subject: [PATCH] sysdig: fix i686 build --- srcpkgs/sysdig/patches/fix-uint64-const.patch | 11 +++++++++++ srcpkgs/sysdig/template | 5 ++--- 2 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/sysdig/patches/fix-uint64-const.patch diff --git a/srcpkgs/sysdig/patches/fix-uint64-const.patch b/srcpkgs/sysdig/patches/fix-uint64-const.patch new file mode 100644 index 0000000000..af3713aeb0 --- /dev/null +++ b/srcpkgs/sysdig/patches/fix-uint64-const.patch @@ -0,0 +1,11 @@ +--- userspace/libsinsp/cgroup_limits.cpp 2019-12-09 23:06:46.000000000 +0100 ++++ userspace/libsinsp/cgroup_limits.cpp 2019-12-20 01:14:18.816734272 +0100 +@@ -9,7 +9,7 @@ + // This reports extremely large values (e.g. almost-but-not-quite 9EiB as set by k8s) as unlimited. + // Note: we use the same maximum value for cpu shares/quotas as well; the typical values are much lower + // and so should never exceed CGROUP_VAL_MAX either +-constexpr const int64_t CGROUP_VAL_MAX = (1UL << 42u) - 1; ++constexpr const int64_t CGROUP_VAL_MAX = (1ULL << 42u) - 1; + + /** + * \brief Read a single int64_t value from cgroupfs diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template index 90d4bbc452..7be9e2aee1 100644 --- a/srcpkgs/sysdig/template +++ b/srcpkgs/sysdig/template @@ -24,9 +24,8 @@ disable_parallel_build=yes dkms_modules="sysdig ${version}" nocross=yes -case "$XBPS_TARGET_MACHINE" in - i686*) broken="https://build.voidlinux.org/builders/i686_builder/builds/21617/steps/shell_3/logs/stdio" ;; -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