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 1046A158094 for ; Tue, 27 Sep 2022 21:41:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2D97CE0536; Tue, 27 Sep 2022 21:41:49 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 11175E0536 for ; Tue, 27 Sep 2022 21:41:49 +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 23028340FF8 for ; Tue, 27 Sep 2022 21:41:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7BD89584 for ; Tue, 27 Sep 2022 21:41:46 +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: <1664314895.4d4bcc14d16dfcab91d9bdce6fb920ec95511da4.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/, dev-util/bpftrace/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/bpftrace/bpftrace-0.15.0-r1.ebuild dev-util/bpftrace/bpftrace-0.15.0-r2.ebuild dev-util/bpftrace/files/bpftrace-0.15.0-llvm-15-pointers.patch X-VCS-Directories: dev-util/bpftrace/ dev-util/bpftrace/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4d4bcc14d16dfcab91d9bdce6fb920ec95511da4 X-VCS-Branch: master Date: Tue, 27 Sep 2022 21:41:46 +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: 8cef0d0d-92fa-4dae-aaf7-f11a3de08e9e X-Archives-Hash: 50f0047a83d747969ed67934a24d9cb4 commit: 4d4bcc14d16dfcab91d9bdce6fb920ec95511da4 Author: Holger Hoffstätte applied-asynchrony com> AuthorDate: Mon Sep 26 08:51:49 2022 +0000 Commit: Sam James gentoo org> CommitDate: Tue Sep 27 21:41:35 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d4bcc14 dev-util/bpftrace: add fix to work properly with LLVM-15 Closes: https://bugs.gentoo.org/872842 Signed-off-by: Holger Hoffstätte applied-asynchrony.com> Signed-off-by: Sam James gentoo.org> ...-0.15.0-r1.ebuild => bpftrace-0.15.0-r2.ebuild} | 1 + .../files/bpftrace-0.15.0-llvm-15-pointers.patch | 30 ++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/dev-util/bpftrace/bpftrace-0.15.0-r1.ebuild b/dev-util/bpftrace/bpftrace-0.15.0-r2.ebuild similarity index 97% rename from dev-util/bpftrace/bpftrace-0.15.0-r1.ebuild rename to dev-util/bpftrace/bpftrace-0.15.0-r2.ebuild index 566a14a29b4a..1095ed8e6fd3 100644 --- a/dev-util/bpftrace/bpftrace-0.15.0-r1.ebuild +++ b/dev-util/bpftrace/bpftrace-0.15.0-r2.ebuild @@ -54,6 +54,7 @@ PATCHES=( "${FILESDIR}/bpftrace-0.11.4-old-kernels.patch" "${FILESDIR}/bpftrace-0.15.0-bcc-025.patch" "${FILESDIR}/bpftrace-0.15.0-binutils-2.39.patch" + "${FILESDIR}/bpftrace-0.15.0-llvm-15-pointers.patch" ) pkg_pretend() { diff --git a/dev-util/bpftrace/files/bpftrace-0.15.0-llvm-15-pointers.patch b/dev-util/bpftrace/files/bpftrace-0.15.0-llvm-15-pointers.patch new file mode 100644 index 000000000000..51ea034b9a88 --- /dev/null +++ b/dev-util/bpftrace/files/bpftrace-0.15.0-llvm-15-pointers.patch @@ -0,0 +1,30 @@ + +From: https://github.com/iovisor/bpftrace/pull/2367 +Bug: https://bugs.gentoo.org/872842 + +From 07fa48a94ef6d6bb1f335de345de18fe9776ca57 Mon Sep 17 00:00:00 2001 +From: kenneth topp +Date: Mon, 26 Sep 2022 00:33:29 -0400 +Subject: [PATCH] Workaround OpaquePointers for LLVM 15 + +This workaround allows bpftrace to be compiled against +LLVM-15. This will have to be address properly before LLVM-16 +More details from LLVM here: https://llvm.org/docs/OpaquePointers.html +--- + src/ast/irbuilderbpf.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/ast/irbuilderbpf.cpp b/src/ast/irbuilderbpf.cpp +index d49883f786..00f0f172ff 100644 +--- a/src/ast/irbuilderbpf.cpp ++++ b/src/ast/irbuilderbpf.cpp +@@ -123,6 +123,9 @@ IRBuilderBPF::IRBuilderBPF(LLVMContext &context, + module_(module), + bpftrace_(bpftrace) + { ++#if LLVM_VERSION_MAJOR == 15 ++ context.setOpaquePointers(false); ++#endif + // Declare external LLVM function + FunctionType *pseudo_func_type = FunctionType::get( + getInt64Ty(),