diff options
Diffstat (limited to 'dev-util/sysdig')
| -rw-r--r-- | dev-util/sysdig/Manifest | 1 | ||||
| -rw-r--r-- | dev-util/sysdig/files/0.27.1-grpc-absl-sync.patch | 25 | ||||
| -rw-r--r-- | dev-util/sysdig/sysdig-0.27.1-r102.ebuild (renamed from dev-util/sysdig/sysdig-0.27.0.ebuild) | 15 |
3 files changed, 35 insertions, 6 deletions
diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest index 2e5405a0486e..cc1b76c77570 100644 --- a/dev-util/sysdig/Manifest +++ b/dev-util/sysdig/Manifest @@ -1,2 +1 @@ -DIST sysdig-0.27.0.tar.gz 933094 BLAKE2B e412bd2a35a62b580344a49e2deee85764710f91327cd63b42913dc361ee96943ffe51b90ee745c420454f0a4be455606d486a91ab3e103d7e396f04dc3f1ff4 SHA512 102150cc641165a6c18ce71e3c6148dc10700f614fec7e1909c29172e3cce02dfa16af56aabdcd420499d0aa89f90fee8f26d92a250b0a521d1b9d416c6a678f DIST sysdig-0.27.1.tar.gz 936415 BLAKE2B f4c15e3a2d4b974c5eafc8374f927dd82f123c05cc1976d04b08e77e1a7c0ff53f37c4e2c0022b7073fcc936310daf76ca3c3611141799ae4f51991bc6f3a0a3 SHA512 690f012c7db0a75ec2eb78fae17aae0f422aa1db0d4c2b15c4a09153fd2f60bd3c00d62238976fdcff2a906d87b2e34b81d02c0c78ad2684a1d6016a9988eb08 diff --git a/dev-util/sysdig/files/0.27.1-grpc-absl-sync.patch b/dev-util/sysdig/files/0.27.1-grpc-absl-sync.patch new file mode 100644 index 000000000000..44ba5c27b094 --- /dev/null +++ b/dev-util/sysdig/files/0.27.1-grpc-absl-sync.patch @@ -0,0 +1,25 @@ +diff -rup sysdig-0.27.1/CMakeLists.txt sysdig-0.27.1-grpc-1.41/CMakeLists.txt +--- sysdig-0.27.1/CMakeLists.txt 2020-09-30 16:21:52.000000000 +0200 ++++ sysdig-0.27.1-grpc-1.41/CMakeLists.txt 2021-10-13 10:34:36.747939272 +0200 +@@ -552,6 +552,7 @@ if(NOT WIN32 AND NOT APPLE) + else() + message(FATAL_ERROR "Couldn't find system grpc") + endif() ++ find_library(ABSL_SYNC_LIB NAMES absl_synchronization) + find_program(GRPC_CPP_PLUGIN grpc_cpp_plugin) + if(NOT GRPC_CPP_PLUGIN) + message(FATAL_ERROR "System grpc_cpp_plugin not found") +diff -rup sysdig-0.27.1/userspace/libsinsp/CMakeLists.txt sysdig-0.27.1-grpc-1.41/userspace/libsinsp/CMakeLists.txt +--- sysdig-0.27.1/userspace/libsinsp/CMakeLists.txt 2020-09-30 16:21:52.000000000 +0200 ++++ sysdig-0.27.1-grpc-1.41/userspace/libsinsp/CMakeLists.txt 2021-10-13 10:37:18.330827194 +0200 +@@ -214,6 +214,10 @@ if(NOT WIN32) + "${JQ_LIB}" + "${B64_LIB}") + ++ if(ABSL_SYNC_LIB) ++ target_link_libraries(sinsp "${ABSL_SYNC_LIB}") ++ endif() ++ + if(NOT MUSL_OPTIMIZED_BUILD) + target_link_libraries(sinsp + rt diff --git a/dev-util/sysdig/sysdig-0.27.0.ebuild b/dev-util/sysdig/sysdig-0.27.1-r102.ebuild index 55a20f694f42..cb1d891d8be2 100644 --- a/dev-util/sysdig/sysdig-0.27.0.ebuild +++ b/dev-util/sysdig/sysdig-0.27.1-r102.ebuild @@ -1,9 +1,13 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 2021 Liguros Authors # Distributed under the terms of the GNU General Public License v2 +EAPI=8 -EAPI=7 +LUA_COMPAT=( lua5-{1,3,4} luajit ) +# Documentation says this might be needed but since the unmigrated ebuilds +# did not enforce it, nor does this one. +#LUA_REQ_USE="-lua52compat" -inherit bash-completion-r1 cmake +inherit bash-completion-r1 cmake lua-single DESCRIPTION="A system exploration and troubleshooting tool" HOMEPAGE="https://sysdig.com/" @@ -13,12 +17,12 @@ LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="libressl +modules test" +REQUIRED_USE="${LUA_REQUIRED_USE}" RESTRICT="!test? ( test )" -RDEPEND=" +RDEPEND="${LUA_DEPS} app-misc/jq:0= dev-cpp/tbb:0= - dev-lang/luajit:2= >=dev-libs/jsoncpp-0.6_pre:0= dev-libs/libb64:0= dev-libs/protobuf:0= @@ -37,6 +41,7 @@ PDEPEND=" src_prepare() { sed -i -e 's:-ggdb::' CMakeLists.txt || die + eapply ${FILESDIR}/0.27.1-grpc-absl-sync.patch cmake_src_prepare } |