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 234EB158087 for ; Sun, 7 Nov 2021 20:59:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E8CA32BC044; Sun, 7 Nov 2021 20:59: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 CCC1E2BC044 for ; Sun, 7 Nov 2021 20:59:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 smtp.gentoo.org (Postfix) with ESMTPS id 7945D342D59 for ; Sun, 7 Nov 2021 20:59:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B41511B8 for ; Sun, 7 Nov 2021 20:59:42 +0000 (UTC) From: "Jakov Smolić" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jakov Smolić" Message-ID: <1636318719.e576dd19c0e1bdc56ad8e9f356490f456f8dc604.jsmolic@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/bpftrace/bpftrace-0.14.0-r3.ebuild X-VCS-Directories: dev-util/bpftrace/ X-VCS-Committer: jsmolic X-VCS-Committer-Name: Jakov Smolić X-VCS-Revision: e576dd19c0e1bdc56ad8e9f356490f456f8dc604 X-VCS-Branch: master Date: Sun, 7 Nov 2021 20:59:42 +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: 9c8d03aa-68ca-468e-a5fe-7de2ed4be82b X-Archives-Hash: 3b6c918e6f2c1ea0c640f8791f5ad062 commit: e576dd19c0e1bdc56ad8e9f356490f456f8dc604 Author: Jakov Smolić gentoo org> AuthorDate: Sun Nov 7 20:58:15 2021 +0000 Commit: Jakov Smolić gentoo org> CommitDate: Sun Nov 7 20:58:39 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e576dd19 dev-util/bpftrace: Statically link (partially), avoid stripping bpftrace bpftrace is currently broken due to BEGIN_trigger symbol missing. To fix this, we need to avoid stripping the binary since it clearly needs to have symbols to work properly, and we also need to link some of the libraries statically into the binary, namely some internal libraries provided by bpftrace need to be statically linked, otherwise the binary will still end up missing the needed symbol (upstream issue - https://github.com/iovisor/bpftrace/issues/954). For previous versions it was enough to skip stripping the binary, but BEGIN_trigger symbol was moved to libbpftrace several versions ago, so even if it is present as a .so library the symbol won't be found. Closes: https://bugs.gentoo.org/809362 Signed-off-by: Jakov Smolić gentoo.org> dev-util/bpftrace/bpftrace-0.14.0-r3.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev-util/bpftrace/bpftrace-0.14.0-r3.ebuild b/dev-util/bpftrace/bpftrace-0.14.0-r3.ebuild index efe4e68822d..4435e4c8379 100644 --- a/dev-util/bpftrace/bpftrace-0.14.0-r3.ebuild +++ b/dev-util/bpftrace/bpftrace-0.14.0-r3.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit toolchain-funcs llvm linux-info cmake +inherit llvm linux-info cmake DESCRIPTION="High-level tracing language for eBPF" HOMEPAGE="https://github.com/iovisor/bpftrace" @@ -67,6 +67,7 @@ pkg_setup() { src_configure() { local -a mycmakeargs=( -DSTATIC_LINKING:BOOL=OFF + -DBUILD_SHARED_LIBS:=OFF -DBUILD_TESTING:BOOL=OFF -DBUILD_FUZZ:BOOL=$(usex fuzzing) -DENABLE_MAN:BOOL=OFF @@ -77,5 +78,6 @@ src_configure() { src_install() { cmake_src_install + dostrip -x /usr/bin/bpftrace doman man/man8/*.? }