diff options
| -rw-r--r-- | patches/btrfs-progs/5.10.1/btrfs-honor-LDFLAGS.patch (renamed from patches/btrfs-progs/5.7/btrfs-honor-LDFLAGS.patch) | 5 | ||||
| -rw-r--r-- | patches/btrfs-progs/5.10.1/btrfs-lzo-via-pkgconfig.patch (renamed from patches/btrfs-progs/5.7/btrfs-lzo2.patch) | 10 | ||||
| -rw-r--r-- | patches/btrfs-progs/5.10.1/btrfs-m4.patch (renamed from patches/btrfs-progs/5.7/btrfs-m4.patch) | 1 |
3 files changed, 8 insertions, 8 deletions
diff --git a/patches/btrfs-progs/5.7/btrfs-honor-LDFLAGS.patch b/patches/btrfs-progs/5.10.1/btrfs-honor-LDFLAGS.patch index 891fe698..7a770a34 100644 --- a/patches/btrfs-progs/5.7/btrfs-honor-LDFLAGS.patch +++ b/patches/btrfs-progs/5.10.1/btrfs-honor-LDFLAGS.patch @@ -3,9 +3,10 @@ @@ -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 -DSTATICBUILD=1 -STATIC_LDFLAGS = -static -Wl,--gc-sections +STATIC_LDFLAGS = $(LDFLAGS) -static -Wl,--gc-sections STATIC_LIBS = $(STATIC_LIBS_BASE) - # don't use FORTIFY with sparse because glibc with FORTIFY can + # Static build with libmount print some warnings due to usage of UID/GID + diff --git a/patches/btrfs-progs/5.7/btrfs-lzo2.patch b/patches/btrfs-progs/5.10.1/btrfs-lzo-via-pkgconfig.patch index 67b31f7b..b1bf436a 100644 --- a/patches/btrfs-progs/5.7/btrfs-lzo2.patch +++ b/patches/btrfs-progs/5.10.1/btrfs-lzo-via-pkgconfig.patch @@ -1,8 +1,6 @@ -diff --git a/configure.ac b/configure.ac -index cf792eb..3ca0806 100644 --- a/configure.ac +++ b/configure.ac -@@ -256,17 +256,8 @@ if ${PKG_CONFIG} udev --atleast-version 190; then +@@ -304,16 +304,8 @@ if ${PKG_CONFIG} udev --atleast-version 190; then fi AC_SUBST(UDEVDIR) @@ -16,9 +14,9 @@ index cf792eb..3ca0806 100644 -AC_SUBST([LZO2_LIBS]) -AC_SUBST([LZO2_LIBS_STATIC]) -AC_SUBST([LZO2_CFLAGS]) -- +PKG_CHECK_MODULES(LZO2, [lzo2]) +PKG_STATIC(LZO2_LIBS_STATIC, [lzo2]) - dnl library stuff - AC_SUBST([LIBBTRFS_MAJOR]) + dnl call PKG_INSTALLDIR from pkg.m4 to set pkgconfigdir + m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR], [AC_MSG_ERROR([please install pkgconf])]) + diff --git a/patches/btrfs-progs/5.7/btrfs-m4.patch b/patches/btrfs-progs/5.10.1/btrfs-m4.patch index 831ff992..75436401 100644 --- a/patches/btrfs-progs/5.7/btrfs-m4.patch +++ b/patches/btrfs-progs/5.10.1/btrfs-m4.patch @@ -12,3 +12,4 @@ Fixes dnl AC_USE_SYSTEM_EXTENSIONS must be called before any macros that run dnl the compiler (like AC_PROG_LIBTOOL) to avoid autoconf errors. AC_USE_SYSTEM_EXTENSIONS + |