summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2021-11-15 18:59:09 +0100
committerThomas Deutschmann <whissi@gentoo.org>2021-11-15 19:14:35 +0100
commitd3ee3d062771a6ad31fae7b0bd1fc88acba58857 (patch)
tree4d7331ee920c11440d4fd99c5fb7e392d2adcedc
parentBump cryptsetup to v2.4.1 (diff)
downloadgenkernel-d3ee3d062771a6ad31fae7b0bd1fc88acba58857.tar.gz
genkernel-d3ee3d062771a6ad31fae7b0bd1fc88acba58857.tar.bz2
genkernel-d3ee3d062771a6ad31fae7b0bd1fc88acba58857.zip
Bump btrfs-progs to v5.15
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
-rw-r--r--patches/btrfs-progs/5.15/btrfs-honor-LDFLAGS.patch (renamed from patches/btrfs-progs/5.12.1/btrfs-honor-LDFLAGS.patch)2
-rw-r--r--patches/btrfs-progs/5.15/btrfs-lzo-via-pkgconfig.patch (renamed from patches/btrfs-progs/5.12.1/btrfs-lzo-via-pkgconfig.patch)0
-rw-r--r--patches/btrfs-progs/5.15/btrfs-m4.patch (renamed from patches/btrfs-progs/5.12.1/btrfs-m4.patch)0
3 files changed, 1 insertions, 1 deletions
diff --git a/patches/btrfs-progs/5.12.1/btrfs-honor-LDFLAGS.patch b/patches/btrfs-progs/5.15/btrfs-honor-LDFLAGS.patch
index 48e967d0..a0cf77cd 100644
--- a/patches/btrfs-progs/5.12.1/btrfs-honor-LDFLAGS.patch
+++ b/patches/btrfs-progs/5.15/btrfs-honor-LDFLAGS.patch
@@ -3,7 +3,7 @@
@@ -130,7 +130,7 @@ LIBBTRFS_LIBS = $(LIBS_BASE) $(LIBS_CRYPTO)
# Static compilation flags
- STATIC_CFLAGS = $(CFLAGS) -ffunction-sections -fdata-sections
+ STATIC_CFLAGS = $(CFLAGS) -ffunction-sections -fdata-sections -DSTATIC_BUILD
-STATIC_LDFLAGS = -static -Wl,--gc-sections
+STATIC_LDFLAGS = $(LDFLAGS) -static -Wl,--gc-sections
STATIC_LIBS = $(STATIC_LIBS_BASE)
diff --git a/patches/btrfs-progs/5.12.1/btrfs-lzo-via-pkgconfig.patch b/patches/btrfs-progs/5.15/btrfs-lzo-via-pkgconfig.patch
index b1bf436a..b1bf436a 100644
--- a/patches/btrfs-progs/5.12.1/btrfs-lzo-via-pkgconfig.patch
+++ b/patches/btrfs-progs/5.15/btrfs-lzo-via-pkgconfig.patch
diff --git a/patches/btrfs-progs/5.12.1/btrfs-m4.patch b/patches/btrfs-progs/5.15/btrfs-m4.patch
index 75436401..75436401 100644
--- a/patches/btrfs-progs/5.12.1/btrfs-m4.patch
+++ b/patches/btrfs-progs/5.15/btrfs-m4.patch