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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7C66B158042 for ; Sat, 9 Nov 2024 09:26:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BA98AE088A; Sat, 9 Nov 2024 09:26:34 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 A3FA1E088A for ; Sat, 9 Nov 2024 09:26:34 +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 E774033BEE9 for ; Sat, 9 Nov 2024 09:26:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 555B51953 for ; Sat, 9 Nov 2024 09:26:32 +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: <1731144340.8ac76c7f1c0b17a74750c0129cbebaa8608ea5f1.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/bpftool/bpftool-7.4.0.ebuild dev-util/bpftool/bpftool-9999.ebuild X-VCS-Directories: dev-util/bpftool/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 8ac76c7f1c0b17a74750c0129cbebaa8608ea5f1 X-VCS-Branch: master Date: Sat, 9 Nov 2024 09:26:32 +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: 4d62747b-a3ec-464c-9435-2220123146b5 X-Archives-Hash: 96d765e1f743ab39638047e728f0dd76 commit: 8ac76c7f1c0b17a74750c0129cbebaa8608ea5f1 Author: Holger Hoffstätte applied-asynchrony com> AuthorDate: Fri Nov 8 21:41:51 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sat Nov 9 09:25:40 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ac76c7f dev-util/bpftool: fix clang dependency & always build CO-RE support Making CO-RE support an optfeature causes way too many unintentional problems, so for now just BDEPEND on clang and explicitly pass it to the build. Closes: https://bugs.gentoo.org/943029 Signed-off-by: Holger Hoffstätte applied-asynchrony.com> Closes: https://github.com/gentoo/gentoo/pull/39247 Signed-off-by: Sam James gentoo.org> dev-util/bpftool/bpftool-7.4.0.ebuild | 6 ++---- dev-util/bpftool/bpftool-9999.ebuild | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dev-util/bpftool/bpftool-7.4.0.ebuild b/dev-util/bpftool/bpftool-7.4.0.ebuild index 55a5c88923ff..b1481b3e2cbe 100644 --- a/dev-util/bpftool/bpftool-7.4.0.ebuild +++ b/dev-util/bpftool/bpftool-7.4.0.ebuild @@ -59,6 +59,7 @@ BDEPEND=" ${PYTHON_DEPS} app-arch/tar dev-python/docutils + $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}[llvm_targets_BPF]') " CONFIG_CHECK="~DEBUG_INFO_BTF" @@ -106,6 +107,7 @@ bpftool_make() { emake \ ARCH="$(tc-arch-kernel)" \ + CLANG="$(get_llvm_prefix -b)/bin/clang" \ HOSTAR="$(tc-getBUILD_AR)" \ HOSTCC="$(tc-getBUILD_CC)" \ HOSTLD="$(tc-getBUILD_LD)" \ @@ -126,7 +128,3 @@ src_install() { bpftool_make DESTDIR="${D}" -C src install bpftool_make mandir="${ED}"/usr/share/man -C docs install } - -pkg_postinst() { - optfeature "clang-bpf-co-re support" sys-devel/clang[llvm_targets_BPF] -} diff --git a/dev-util/bpftool/bpftool-9999.ebuild b/dev-util/bpftool/bpftool-9999.ebuild index 03f97becf881..4c6ef01a02a4 100644 --- a/dev-util/bpftool/bpftool-9999.ebuild +++ b/dev-util/bpftool/bpftool-9999.ebuild @@ -59,6 +59,7 @@ BDEPEND=" ${PYTHON_DEPS} app-arch/tar dev-python/docutils + $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}[llvm_targets_BPF]') " CONFIG_CHECK="~DEBUG_INFO_BTF" @@ -95,6 +96,7 @@ bpftool_make() { emake \ ARCH="$(tc-arch-kernel)" \ + CLANG="$(get_llvm_prefix -b)/bin/clang" \ HOSTAR="$(tc-getBUILD_AR)" \ HOSTCC="$(tc-getBUILD_CC)" \ HOSTLD="$(tc-getBUILD_LD)" \ @@ -115,7 +117,3 @@ src_install() { bpftool_make DESTDIR="${D}" -C src install bpftool_make mandir="${ED}"/usr/share/man -C docs install } - -pkg_postinst() { - optfeature "clang-bpf-co-re support" sys-devel/clang[llvm_targets_BPF] -}