commit: 85a8243dcdfc6b3092fcbdcab11c2c4417b752e9 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Fri Jul 15 18:37:26 2022 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Mon Jul 18 21:41:03 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85a8243d
sys-fs/btrfs-progs: remove unused patch(es) Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/26428 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> .../files/5.16-linux-headers-before-5.11.patch | 40 ---------------------- 1 file changed, 40 deletions(-) diff --git a/sys-fs/btrfs-progs/files/5.16-linux-headers-before-5.11.patch b/sys-fs/btrfs-progs/files/5.16-linux-headers-before-5.11.patch deleted file mode 100644 index 184656d96d22..000000000000 --- a/sys-fs/btrfs-progs/files/5.16-linux-headers-before-5.11.patch +++ /dev/null @@ -1,40 +0,0 @@ -https://github.com/kdave/btrfs-progs/commit/b0cfe12c4d4b8b4ef335cdf4ddefcbdcd1b70d58.patch -https://bugs.gentoo.org/831817 - -From b0cfe12c4d4b8b4ef335cdf4ddefcbdcd1b70d58 Mon Sep 17 00:00:00 2001 -From: David Sterba <dste...@suse.com> -Date: Thu, 13 Jan 2022 14:47:08 +0100 -Subject: [PATCH] btrfs-progs: kerncompat: add local definition for alignment - macros - -There's still problem left with compilation on musl and kernel < 5.11, -because __ALIGN_KERNEL is not defined anymore: - -../bin/ld: kernel-shared/volumes.o: in function `create_chunk': -volumes.c:(.text+0x17f8): undefined reference to `__ALIGN_KERNEL' - -Due to the entangled includes and unconditional definition of -__ALIGN_KERNEL, we can't use #ifdef in kerncompat.h to define it -eventually (as kerncompat.h is the first include). Instead add local -definitions of the macros and rename them to avoid name clashes. - -Pull-request: #433 -Signed-off-by: David Sterba <dste...@suse.com> ---- a/kerncompat.h -+++ b/kerncompat.h -@@ -359,7 +359,14 @@ do { \ - - /* Alignment check */ - #define IS_ALIGNED(x, a) (((x) & ((typeof(x))(a) - 1)) == 0) --#define ALIGN(x, a) __ALIGN_KERNEL((x), (a)) -+ -+/* -+ * Alignment, copied and renamed from /usr/include/linux/const.h to work around -+ * issues caused by moving the definition in 5.12 -+ */ -+#define __ALIGN_KERNEL__(x, a) __ALIGN_KERNEL_MASK__(x, (typeof(x))(a) - 1) -+#define __ALIGN_KERNEL_MASK__(x, mask) (((x) + (mask)) & ~(mask)) -+#define ALIGN(x, a) __ALIGN_KERNEL__((x), (a)) - - static inline int is_power_of_2(unsigned long n) - {
