commit: c1e70e74d97b9cccca55f9f8321f81916d0d1870 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Dec 31 02:49:26 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Dec 31 02:50:01 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1e70e74
sys-fs/btrfs-progs: drop unnecessary musl patch Adjusted linux-headers patch instead. Bug: https://bugs.gentoo.org/830277 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild | 4 --- .../files/5.15-musl-const.h-include.patch | 34 ---------------------- 2 files changed, 38 deletions(-) diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild index 01b66383b662..64cc91680915 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild @@ -79,10 +79,6 @@ fi REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -PATCHES=( - "${FILESDIR}"/5.15-musl-const.h-include.patch -) - pkg_setup() { use python && python-single-r1_pkg_setup } diff --git a/sys-fs/btrfs-progs/files/5.15-musl-const.h-include.patch b/sys-fs/btrfs-progs/files/5.15-musl-const.h-include.patch deleted file mode 100644 index a9156ade4b79..000000000000 --- a/sys-fs/btrfs-progs/files/5.15-musl-const.h-include.patch +++ /dev/null @@ -1,34 +0,0 @@ -https://cgit.openembedded.org/openembedded-core/plain/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch?id=fd8989db25c674ca65389a2d41bf5b447e8794be - -From: Bruce Ashfield <bruce.ashfi...@gmail.com> -Date: Fri, 18 Jun 2021 11:10:36 -0400 -Subject: [PATCH] btrfs-progs: include linux/const.h to fix build with 5.12+ - headers - -btrfs-tools compile fails with mips, musl and 5.12+ headers. - -The definition of __ALIGN_KERNEL has moved in 5.12+ kernels, so we -add an explicit include of const.h to pickup the macro: - - | make: *** [Makefile:595: mkfs.btrfs] Error 1 - | make: *** Waiting for unfinished jobs.... - | libbtrfs.a(volumes.o): in function `dev_extent_search_start': - | /usr/src/debug/btrfs-tools/5.12.1-r0/git/kernel-shared/volumes.c:464: undefined reference to `__ALIGN_KERNEL' - | collect2: error: ld returned 1 exit status - -This is safe for older kernel's as well, since the header still -exists, and is valid to include. - -Upstream-status: OE Specific [mips64 + musl + libc-headers] - -Signed-off-by: Bruce Ashfield <bruce.ashfi...@gmail.com> ---- a/kerncompat.h -+++ b/kerncompat.h -@@ -30,6 +30,7 @@ - #include <linux/types.h> - #include <linux/kernel.h> - #include <stdint.h> -+#include <linux/const.h> - - #include <features.h> -
