From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 28D9215801B for ; Mon, 21 Aug 2023 19:57:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5BDF62BC030; Mon, 21 Aug 2023 19:57:46 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1C0802BC030 for ; Mon, 21 Aug 2023 19:57:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0601134125D for ; Mon, 21 Aug 2023 19:57:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3752D1053 for ; Mon, 21 Aug 2023 19:57:43 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1692647628.c9f22ce393892429b283466d8d21728ef36f7c5b.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/sysdig/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/sysdig/sysdig-0.29.3-r2.ebuild X-VCS-Directories: dev-util/sysdig/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c9f22ce393892429b283466d8d21728ef36f7c5b X-VCS-Branch: master Date: Mon, 21 Aug 2023 19:57:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ea270b9e-1d53-4672-9b6e-4f88e22f0876 X-Archives-Hash: dbaaf29bc0d43780b35dc7e2fb5ebf99 commit: c9f22ce393892429b283466d8d21728ef36f7c5b Author: Holger Hoffstätte applied-asynchrony com> AuthorDate: Mon Aug 21 19:32:14 2023 +0000 Commit: Sam James gentoo org> CommitDate: Mon Aug 21 19:53:48 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9f22ce3 dev-util/sysdig: enforce -std=c++14 Closes: https://bugs.gentoo.org/912774 Signed-off-by: Holger Hoffstätte applied-asynchrony.com> Closes: https://github.com/gentoo/gentoo/pull/32404 Signed-off-by: Sam James gentoo.org> dev-util/sysdig/sysdig-0.29.3-r2.ebuild | 96 +++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/dev-util/sysdig/sysdig-0.29.3-r2.ebuild b/dev-util/sysdig/sysdig-0.29.3-r2.ebuild new file mode 100644 index 000000000000..d5198a4305c4 --- /dev/null +++ b/dev-util/sysdig/sysdig-0.29.3-r2.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( luajit ) + +inherit bash-completion-r1 cmake lua-single + +DESCRIPTION="A system exploration and troubleshooting tool" +HOMEPAGE="https://sysdig.com/" + +# For now we need to bump this version of falcosecurity/libs manually; +# check the used git revision in /cmake/modules/falcosecurity-libs.cmake +LIBS_COMMIT="e5c53d648f3c4694385bbe488e7d47eaa36c229a" + +SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz + https://github.com/falcosecurity/libs/archive/${LIBS_COMMIT}.tar.gz -> falcosecurity-libs-${LIBS_COMMIT}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+modules" +REQUIRED_USE="${LUA_REQUIRED_USE}" + +RDEPEND="${LUA_DEPS} + app-misc/jq + dev-cpp/tbb:= + dev-cpp/yaml-cpp:= + dev-libs/libb64:= + dev-libs/openssl:= + dev-libs/protobuf:= + net-dns/c-ares:= + net-libs/grpc:= + net-misc/curl + sys-libs/ncurses:= + sys-libs/zlib:=" + +DEPEND="${RDEPEND} + dev-cpp/nlohmann_json + dev-cpp/valijson + virtual/os-headers" + +# for now pin the driver to the same ebuild version +PDEPEND="modules? ( =dev-util/scap-driver-${PV}* )" + +src_prepare() { + # manually apply patch to falcosecurity-libs dependency + pushd "${WORKDIR}" && \ + eapply -p0 "${FILESDIR}/${PV}-libs-gcc13.patch" && \ + popd + + # force C++14 standard for libs & main + sed -i -e 's:-std=c++0x:-std=c++14:' "${WORKDIR}"/libs-${LIBS_COMMIT}/cmake/modules/CompilerFlags.cmake || die + sed -i -e 's:-std=c++0x:-std=c++14:' -e 's:-ggdb::' CMakeLists.txt || die + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + # don't build driver + -DBUILD_DRIVER=OFF + + # libscap examples are not installed or really useful + -DBUILD_LIBSCAP_EXAMPLES=OFF + + # point to the falcosecurity-libs tree + -DFALCOSECURITY_LIBS_SOURCE_DIR="${WORKDIR}"/libs-${LIBS_COMMIT} + + # explicitly set version + -DSYSDIG_VERSION=${PV} + + # unbundle the deps + -DUSE_BUNDLED_DEPS=OFF + + # add valijson include path to prevent downloading + -DVALIJSON_INCLUDE="${ESYSROOT}"/usr/include + + # enable chisels + -DWITH_CHISEL=ON + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + # remove driver headers + rm -r "${ED}"/usr/src || die + + # move bashcomp to the proper location + dobashcomp "${ED}"/usr/etc/bash_completion.d/sysdig || die + rm -r "${ED}"/usr/etc || die +}