commit: 6f98ae4ebb597b911a897d7c00c2c5f946746e02 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Sun Mar 30 08:24:45 2025 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Sun Mar 30 11:15:06 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f98ae4e
sys-fs/bcachefs-tools: remove unused patch(es) Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/41379 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> .../bcachefs-tools-1.13.0-rustc-default-libs.patch | 36 ---------------------- 1 file changed, 36 deletions(-) diff --git a/sys-fs/bcachefs-tools/files/bcachefs-tools-1.13.0-rustc-default-libs.patch b/sys-fs/bcachefs-tools/files/bcachefs-tools-1.13.0-rustc-default-libs.patch deleted file mode 100644 index dad793cbe5e3..000000000000 --- a/sys-fs/bcachefs-tools/files/bcachefs-tools-1.13.0-rustc-default-libs.patch +++ /dev/null @@ -1,36 +0,0 @@ -https://github.com/koverstreet/bcachefs-tools/commit/10dc29d5b9a44e7bb8aff657e73c0c68dccc32b9 -From: Alyssa Ross <[email protected]> -Date: Sat, 12 Oct 2024 18:13:19 +0200 -Subject: [PATCH] Pass -C default-linker-libraries to rustc - -By default, rustc passes -nodefaultlibs to the linker. In some cases, -this can cause compiler builtins (e.g. __cpu_model, used by -__builtin_cpu_supports) not to be linked in: - -= note: /nix/store/s2cjhni3s6shh0n35ay1hpj8d85k44qk-x86_64-unknown-linux-musl-binutils-2.43.1/bin/x86_64-unknown-linux-musl-ld: ./libbcachefs.a(tools-util.o): in function `resolve_crc32c': - /build/source/c_src/tools-util.c:457:(.text+0x1023): undefined reference to `__cpu_model' - collect2: error: ld returned 1 exit status - -I saw this with static musl GCC builds, and others have reported it with -Clang. - -Link: https://github.com/koverstreet/bcachefs-tools/issues/300 -Signed-off-by: Alyssa Ross <[email protected]> -Signed-off-by: Kent Overstreet <[email protected]> ---- a/Makefile -+++ b/Makefile -@@ -73,12 +73,13 @@ CFLAGS+=$(call cc-disable-warning, zero-length-array) - CFLAGS+=$(call cc-disable-warning, shift-overflow) - CFLAGS+=$(call cc-disable-warning, enum-conversion) - CFLAGS+=$(call cc-disable-warning, gnu-variable-sized-type-not-at-end) -+export RUSTFLAGS=-C default-linker-libraries - - PKGCONFIG_LIBS="blkid uuid liburcu libsodium zlib liblz4 libzstd libudev libkeyutils" - ifdef BCACHEFS_FUSE - PKGCONFIG_LIBS+="fuse3 >= 3.7" - CFLAGS+=-DBCACHEFS_FUSE -- export RUSTFLAGS=--cfg fuse -+ RUSTFLAGS+=--cfg fuse - endif - - PKGCONFIG_CFLAGS:=$(shell $(PKG_CONFIG) --cflags $(PKGCONFIG_LIBS))
