aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'patches')
-rw-r--r--patches/btrfs-progs/5.1.1/btrfs-lzo2.patch24
-rw-r--r--patches/btrfs-progs/5.1.1/btrfs-m4.patch14
2 files changed, 38 insertions, 0 deletions
diff --git a/patches/btrfs-progs/5.1.1/btrfs-lzo2.patch b/patches/btrfs-progs/5.1.1/btrfs-lzo2.patch
new file mode 100644
index 00000000..67b31f7b
--- /dev/null
+++ b/patches/btrfs-progs/5.1.1/btrfs-lzo2.patch
@@ -0,0 +1,24 @@
+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
+ fi
+ AC_SUBST(UDEVDIR)
+
+-dnl lzo library does not provide pkg-config, let use classic way
+-AC_CHECK_LIB([lzo2], [lzo_version], [
+- LZO2_LIBS="-llzo2"
+- LZO2_CFLAGS=""
+- LZO2_LIBS_STATIC="-llzo2"],[
+- AC_MSG_ERROR([cannot find lzo2 library])
+-])
+-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])
diff --git a/patches/btrfs-progs/5.1.1/btrfs-m4.patch b/patches/btrfs-progs/5.1.1/btrfs-m4.patch
new file mode 100644
index 00000000..831ff992
--- /dev/null
+++ b/patches/btrfs-progs/5.1.1/btrfs-m4.patch
@@ -0,0 +1,14 @@
+Fixes
+
+./configure: line 4077: BTRFS_DETECT_CSTD: command not found
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -18,6 +18,7 @@ AC_SUBST([CFLAGS])
+ AC_PREREQ([2.60])
+
+ AC_CONFIG_AUX_DIR([config])
++AC_CONFIG_MACRO_DIR([m4])
+ 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