commit: cddadc4cee9143e4b830f6ecade44a4fa99d9816 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Wed Feb 4 13:29:23 2026 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Wed Feb 4 17:18:04 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cddadc4c
dev-util/bpf-linker: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-util/bpf-linker/Manifest | 3 - dev-util/bpf-linker/bpf-linker-0.9.14-r1.ebuild | 90 ----------------- dev-util/bpf-linker/bpf-linker-0.9.14.ebuild | 83 ---------------- .../files/bpf-linker-0.9.14-llvm-21.patch | 107 --------------------- .../files/bpf-linker-0.9.14-rust-1.88.patch | 39 -------- 5 files changed, 322 deletions(-) diff --git a/dev-util/bpf-linker/Manifest b/dev-util/bpf-linker/Manifest index 010c8c74877e..7398149be92a 100644 --- a/dev-util/bpf-linker/Manifest +++ b/dev-util/bpf-linker/Manifest @@ -1,5 +1,3 @@ -DIST bpf-linker-0.9.14-crates.tar.xz 14190616 BLAKE2B 5384062cb678ef2ec19401fddb023a30fb9ae02f8e7f656ac82ac1061ba32cbde448baafa27e73938901e7d1a049a9d7eaea8ddfe0e40b96c3004865a108102c SHA512 095674241b50069d62789ce875fe6b3df2351e77f538c4f740a0388b68f6c26e25268c4ef41ca13d53b974c615a12595a82bfcde7a7e287c3e8a00cee44ed60a -DIST bpf-linker-0.9.14.gh.tar.gz 47526 BLAKE2B cb6a9d1fadff1554d9ad69934e3d22ef325f38ea3c97410e1c155e8d88835aaeb485e9c06c6ada3e975881190fe8c50fc0ecdf2921dbc83abd0f7873e1a08001 SHA512 0c5e530f8b94dbd4a290a92c11a4a99c4b92c8ee6b6dc6f00c25d5dcb43fa44c7a62d12e8a10edae2078b78cf7141363060b08cb6b98a5026dbaeb60d7c95bf1 DIST bpf-linker-0.9.15-crates.tar.xz 16330432 BLAKE2B b22ecf0efe6a0dbcd76d4468f3ba674851fd41a9a3a2f71cc4f6c2f1cfcbb69043c49ae28fce441cb3972f6a7bcaa7d1aa51f78b3acb3ca67add23573c81de70 SHA512 32c172cb84999cbf9eed73bc2988fd805cf6e028349884e0af006e828374ffef3a2d47033501115dfd32641927fd7f679132c3a57c8dc475d709fab91a05b625 DIST bpf-linker-0.9.15.gh.tar.gz 53754 BLAKE2B 91554e366b4981a28a74a154258970702d8a259ea8ca3ce48d510e8b87978d8dd438505aec1a53a1c7b4d7c3e48ae3a996b03271f7e10f2dcf328e80188e432a SHA512 8c55eb0d46ca4229a1d23333b38a3d9b6dc2e21e3d720a9f7b57e0a1435c895e3829ed370d2d25fec8d5bf41fd75543a6cb493d78f4bddc1d903c831e13b9784 DIST compiler_builtins-0.1.146.crate 212475 BLAKE2B 9036a9e643ad310932c7943ce5e41c53029f08e604e8ed0a6255d49cf98ecea832dd19ffd109c34a83873880f1c281dc5991bf3f34b9e04f6e9562d40926fd48 SHA512 51db04a4e2b7fbc8a7b7407d57a9c82884f9950f5937cf422d14d4c53bc6b942d90e443857cf0c363b0365202713ecbaea3977e9c1cf534c54b041a1f6efd409 @@ -7,4 +5,3 @@ DIST compiler_builtins-0.1.152.crate 224321 BLAKE2B 232cbc3afb4de5f9ed401df8dce4 DIST compiler_builtins-0.1.158.crate 245300 BLAKE2B 2f0c6281af04eab6d8b2d819e3169ec384beda8b2326a41bfef77fcea24b2fe20d83ed5e2cc0a2c1635dd2f4a4b42fba161a1d6305451e767c8f79c501065d8b SHA512 8b440293d8fb3184b665cddd25dfcc8c65f216dfe5e353db0e867f0346b1aff48e3af82ed3e77aee0ff1a1767e6f35ce348048d3aabc168feb6ab633f19214e5 DIST compiler_builtins-0.1.160.crate 242364 BLAKE2B c85996e22b19e08eb4fb0d679b0b357d60f072ed2611b332d042f6d02d02f5c8fad6bad32baa5c86d5142ddeb79ff939fbb25ed68a9f8134f4a25c6cb961387c SHA512 b8a10cf1b1b42fdc070ba7b3ea4a018c912beb1540b1aef2622302e6ad876b1d488c8ef08b90d2fcab4d32d9c836c0fa552c52c1fe96afc2ad0e1be95c3ef6f6 DIST compiletest-rs-0c1418d5cd5177ee9d863a5c2f300c0973cfc4f1.gh.tar.gz 61012 BLAKE2B f282dcb1d88021245dcdb03101f37fcb6a3936690716fc1470fdd671985c2757bb92c5f3d3d1e7ed2663529fc89ed587b16c70f644f1097ae039cbbcab96d809 SHA512 b7d192e6ab3617170460f2f08fb5a7ff11f0f48735de5d8d3924ffcc3f724d4c60821a7387ca9e37dfa5462645cfd7d0e9f2852da292e733d514822e9ccbaf76 -DIST compiletest-rs-cb121796a041255ae0afcd9c2766bee4ebfd54f0.gh.tar.gz 60800 BLAKE2B 30ca17a8420b6dc19e299e7d18a536b480c19bfdc5bc8237107f8ce2d9f009cfe73bda11f9f0cda009f0608d2259a83333470e5d9bb00b7aeafbaa85454a725a SHA512 5d5ca47a712dd5e6593e6debba272f35da220ec3411e504d1dcac0162f5dfb209068f1465e7bc7e1ffe9c3a2f6d2cb4e5b00b33d43536e3dcd2b6622d8f69361 diff --git a/dev-util/bpf-linker/bpf-linker-0.9.14-r1.ebuild b/dev-util/bpf-linker/bpf-linker-0.9.14-r1.ebuild deleted file mode 100644 index 91bc378e0207..000000000000 --- a/dev-util/bpf-linker/bpf-linker-0.9.14-r1.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Extra crates required at runtime via rustc-build-sysroot crate. -# Note: versions are locked in /usr/lib/rust/*/lib/rustlib/src/rust/library/Cargo.lock. -CRATES=" - [email protected] - [email protected] - [email protected] -" - -# Implied by crates above. -RUST_MIN_VER=1.86.0 -RUST_MAX_VER=1.88.0 - -declare -A GIT_CRATES=( - [compiletest_rs]='https://github.com/Manishearth/compiletest-rs;cb121796a041255ae0afcd9c2766bee4ebfd54f0;compiletest-rs-%commit%' -) - -# bpf-linker code specifically requires LLVM 21 right now -LLVM_COMPAT=( 21 ) -RUST_REQ_USE="llvm_targets_BPF(+),rust-src" - -inherit cargo llvm-r2 - -DESCRIPTION="Simple BPF static linker" -HOMEPAGE="https://github.com/aya-rs/bpf-linker/"; -SRC_URI=" - https://github.com/aya-rs/bpf-linker/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz - https://github.com/gentoo-crate-dist/bpf-linker/releases/download/v${PV}/${P}-crates.tar.xz - ${CARGO_CRATE_URIS} -" - -LICENSE="|| ( MIT Apache-2.0 )" -# Dependent crate licenses -LICENSE+=" - ISC MIT Unicode-3.0 Unicode-DFS-2016 - || ( Apache-2.0 Boost-1.0 ) -" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND=" - $(llvm_gen_dep ' - llvm-core/llvm:${LLVM_SLOT}=[llvm_targets_BPF] - ') -" -RDEPEND=" - ${DEPEND} - ${RUST_DEPEND} -" -BDEPEND=" - test? ( - dev-util/btfdump - ) -" - -QA_FLAGS_IGNORED=/usr/bin/bpf-linker - -pkg_setup() { - rust_pkg_setup -} - -src_prepare() { - local PATCHES=( - # https://github.com/aya-rs/bpf-linker/pull/289 - "${FILESDIR}/${P}-llvm-21.patch" - # https://github.com/aya-rs/bpf-linker/pull/265 - "${FILESDIR}/${P}-rust-1.88.patch" - ) - - default - - # replace upstream crate substitution with our crate substitution, sigh - local ct_dep=$(grep ^compiletest_rs "${ECARGO_HOME}"/config.toml || die) - sed -i -e "/compiletest_rs/s;^.*$;${ct_dep};" Cargo.toml || die -} - -src_configure() { - cargo_src_configure --no-default-features - - # note: this needs to be updated to match llvm crate version - export LLVM_SYS_201_PREFIX="$(get_llvm_prefix -d)" - # the package requires BPF target that is only available in nightly - export RUSTC_BOOTSTRAP=1 -} diff --git a/dev-util/bpf-linker/bpf-linker-0.9.14.ebuild b/dev-util/bpf-linker/bpf-linker-0.9.14.ebuild deleted file mode 100644 index 9612cb3c193b..000000000000 --- a/dev-util/bpf-linker/bpf-linker-0.9.14.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Extra crates required at runtime via rustc-build-sysroot crate. -# Note: versions are locked in /usr/lib/rust/*/lib/rustlib/src/rust/library/Cargo.lock. -CRATES=" - [email protected] - [email protected] -" - -# Implied by crates above. -RUST_MIN_VER=1.86.0 -RUST_MAX_VER=1.87.0 - -declare -A GIT_CRATES=( - [compiletest_rs]='https://github.com/Manishearth/compiletest-rs;cb121796a041255ae0afcd9c2766bee4ebfd54f0;compiletest-rs-%commit%' -) - -# this version of bpf-linker is incompatible with changes in LLVM 21 -LLVM_COMPAT=( 20 ) -RUST_REQ_USE="llvm_targets_BPF(+),rust-src" - -inherit cargo llvm-r2 - -DESCRIPTION="Simple BPF static linker" -HOMEPAGE="https://github.com/aya-rs/bpf-linker/"; -SRC_URI=" - https://github.com/aya-rs/bpf-linker/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz - https://github.com/gentoo-crate-dist/bpf-linker/releases/download/v${PV}/${P}-crates.tar.xz - ${CARGO_CRATE_URIS} -" - -LICENSE="|| ( MIT Apache-2.0 )" -# Dependent crate licenses -LICENSE+=" - ISC MIT Unicode-3.0 Unicode-DFS-2016 - || ( Apache-2.0 Boost-1.0 ) -" -SLOT="0" -KEYWORDS="amd64 ~arm64" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND=" - $(llvm_gen_dep ' - llvm-core/llvm:${LLVM_SLOT}=[llvm_targets_BPF] - ') -" -RDEPEND=" - ${DEPEND} - ${RUST_DEPEND} -" -BDEPEND=" - test? ( - dev-util/btfdump - ) -" - -QA_FLAGS_IGNORED=/usr/bin/bpf-linker - -pkg_setup() { - rust_pkg_setup -} - -src_prepare() { - default - - # replace upstream crate substitution with our crate substitution, sigh - local ct_dep=$(grep ^compiletest_rs "${ECARGO_HOME}"/config.toml || die) - sed -i -e "/compiletest_rs/s;^.*$;${ct_dep};" Cargo.toml || die -} - -src_configure() { - cargo_src_configure --no-default-features - - # note: this needs to be updated to match llvm crate version - export LLVM_SYS_201_PREFIX="$(get_llvm_prefix -d)" - # the package requires BPF target that is only available in nightly - export RUSTC_BOOTSTRAP=1 -} diff --git a/dev-util/bpf-linker/files/bpf-linker-0.9.14-llvm-21.patch b/dev-util/bpf-linker/files/bpf-linker-0.9.14-llvm-21.patch deleted file mode 100644 index b8ef3f72cc31..000000000000 --- a/dev-util/bpf-linker/files/bpf-linker-0.9.14-llvm-21.patch +++ /dev/null @@ -1,107 +0,0 @@ -From b1e6dcd3c8a75489329707709a14403e247e0fa0 Mon Sep 17 00:00:00 2001 -From: Michal Rostecki <[email protected]> -Date: Thu, 14 Aug 2025 13:36:12 +0200 -Subject: [PATCH 2/3] di: Update operand indices - -Operand indices in `DIType` and all children types were moved starting -from LLVM 21[0]. - -[0] llvm/llvm-project@3b90597c2ceaae86608214f6b62b43e55823102b ---- - src/llvm/types/di.rs | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/llvm/types/di.rs b/src/llvm/types/di.rs -index 76757cb1..c44252f0 100644 ---- a/src/llvm/types/di.rs -+++ b/src/llvm/types/di.rs -@@ -150,8 +150,8 @@ impl<'ctx> From<DIDerivedType<'ctx>> for DIType<'ctx> { - #[repr(u32)] - enum DIDerivedTypeOperand { - /// [`DIType`] representing a base type of the given derived type. -- /// [Reference in LLVM code](https://github.com/llvm/llvm-project/blob/llvmorg-17.0.3/llvm/include/llvm/IR/DebugInfoMetadata.h#L1032). -- BaseType = 3, -+ /// [Reference in LLVM code](https://github.com/llvm/llvm-project/blob/llvmorg-21.1.0-rc3/llvm/include/llvm/IR/DebugInfoMetadata.h#L1386). -+ BaseType = 5, - } - - /// Represents the debug information for a derived type in LLVM IR. -@@ -212,8 +212,8 @@ impl DIDerivedType<'_> { - #[repr(u32)] - enum DICompositeTypeOperand { - /// Elements of the composite type. -- /// [Reference in LLVM code](https://github.com/llvm/llvm-project/blob/llvmorg-17.0.3/llvm/include/llvm/IR/DebugInfoMetadata.h#L1230). -- Elements = 4, -+ /// [Reference in LLVM code](https://github.com/llvm/llvm-project/blob/llvmorg-21.1.0-rc3/llvm/include/llvm/IR/DebugInfoMetadata.h#L1813). -+ Elements = 6, - } - - /// Represents the debug info for a composite type in LLVM IR. - -From 9668fb5b6f9497a598de920a218d28d57b3e1917 Mon Sep 17 00:00:00 2001 -From: Michal Rostecki <[email protected]> -Date: Thu, 14 Aug 2025 14:20:20 +0200 -Subject: [PATCH 3/3] fix: Do not expect strictly sequential order when not - necessary - -We've noticed that ordering is different on different environments. -Let's relax the check with `CHECK-DAG`. What matters is that all -expected names/instructions are present. ---- - tests/assembly/di_generics.rs | 6 +++--- - tests/assembly/ignore-inline-never.rs | 4 ++-- - tests/btf/assembly/exported-symbols.rs | 8 ++++---- - 3 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/tests/assembly/di_generics.rs b/tests/assembly/di_generics.rs -index 08282d4c..0ec5a749 100644 ---- a/tests/assembly/di_generics.rs -+++ b/tests/assembly/di_generics.rs -@@ -63,6 +63,6 @@ pub fn my_function<T: Add<Output = T> + Copy>(x: T, y: T) -> T { - .add(y) - } - --// CHECK: name: "Foo_3C_u32_3E_" --// CHECK: name: "Bar_3C_di_generics_3A__3A_Foo_3C_u32_3E__3E_" --// CHECK: name: "my_function_3C_u32_3E_" -+// CHECK-DAG: name: "Foo_3C_u32_3E_" -+// CHECK-DAG: name: "Bar_3C_di_generics_3A__3A_Foo_3C_u32_3E__3E_" -+// CHECK-DAG: name: "my_function_3C_u32_3E_" -diff --git a/tests/assembly/ignore-inline-never.rs b/tests/assembly/ignore-inline-never.rs -index 58a8e583..02bdbc25 100644 ---- a/tests/assembly/ignore-inline-never.rs -+++ b/tests/assembly/ignore-inline-never.rs -@@ -21,6 +21,6 @@ fn actually_inlined(a: u64) -> u64 { - pub extern "C" fn fun(a: u64) -> u64 { - // CHECK-LABEL: fun: - actually_inlined(a) -- // CHECK: r{{[0-9]}} = r{{[0-9]}} -- // CHECK-NEXT: r{{[0-9]}} += 42 -+ // CHECK-DAG: r{{[0-9]}} = r{{[0-9]}} -+ // CHECK-DAG: r{{[0-9]}} += 42 - } -diff --git a/tests/btf/assembly/exported-symbols.rs b/tests/btf/assembly/exported-symbols.rs -index a5b99bf0..921b2e68 100644 ---- a/tests/btf/assembly/exported-symbols.rs -+++ b/tests/btf/assembly/exported-symbols.rs -@@ -35,7 +35,7 @@ fn inline_function_2(v: u8) -> u8 { - } - - // #[no_mangle] functions keep linkage=global --// CHECK: <FUNC> 'local_no_mangle' --> global [{{[0-9]+}} -+// CHECK-DAG: <FUNC> 'local_no_mangle' --> global [{{[0-9]+}} - - // check that parameter names are preserved - // CHECK: <FUNC_PROTO> -@@ -43,8 +43,8 @@ fn inline_function_2(v: u8) -> u8 { - // CHECK-NEXT: _arg2 - - // public functions get static linkage --// CHECK: <FUNC> '{{.*}}local_public{{.*}}' --> static --// CHECK: <FUNC> '{{.*}}dep_public_symbol{{.*}}' --> static -+// CHECK-DAG: <FUNC> '{{.*}}local_public{{.*}}' --> static -+// CHECK-DAG: <FUNC> '{{.*}}dep_public_symbol{{.*}}' --> static - - // #[no_mangle] is honored for dep functions --// CHECK: <FUNC> 'dep_no_mangle' --> global -+// CHECK-DAG: <FUNC> 'dep_no_mangle' --> global diff --git a/dev-util/bpf-linker/files/bpf-linker-0.9.14-rust-1.88.patch b/dev-util/bpf-linker/files/bpf-linker-0.9.14-rust-1.88.patch deleted file mode 100644 index c9d5e7521df0..000000000000 --- a/dev-util/bpf-linker/files/bpf-linker-0.9.14-rust-1.88.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 223f8540e80c75730d95d925d6ab9e03cfbfa011 Mon Sep 17 00:00:00 2001 -From: Tamir Duberstein <[email protected]> -Date: Tue, 1 Apr 2025 10:19:23 -0400 -Subject: [PATCH] Appease `invalid_null_arguments` - -This was promoted from a clippy lint in nightly. - -Link: https://github.com/rust-lang/rust/pull/119220 ---- - tests/assembly/auxiliary/dep-exports.rs | 2 +- - tests/btf/assembly/auxiliary/dep-exports.rs | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/assembly/auxiliary/dep-exports.rs b/tests/assembly/auxiliary/dep-exports.rs -index 35e003cf..a3dcd682 100644 ---- a/tests/assembly/auxiliary/dep-exports.rs -+++ b/tests/assembly/auxiliary/dep-exports.rs -@@ -4,7 +4,7 @@ - - pub fn dep_public_symbol() -> u8 { - // read_volatile stops LTO inlining the function in the calling crate -- unsafe { core::ptr::read_volatile(0 as *const u8) } -+ unsafe { core::ptr::read_volatile(core::ptr::dangling()) } - } - - #[no_mangle] -diff --git a/tests/btf/assembly/auxiliary/dep-exports.rs b/tests/btf/assembly/auxiliary/dep-exports.rs -index 6adcdc03..3a95ecde 100644 ---- a/tests/btf/assembly/auxiliary/dep-exports.rs -+++ b/tests/btf/assembly/auxiliary/dep-exports.rs -@@ -5,7 +5,7 @@ - #[inline(never)] - pub fn dep_public_symbol() -> u8 { - // read_volatile stops LTO inlining the function in the calling crate -- unsafe { core::ptr::read_volatile(0 as *const u8) } -+ unsafe { core::ptr::read_volatile(core::ptr::dangling()) } - } - - #[no_mangle]
