diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2019-07-14 11:53:01 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2019-07-14 13:58:17 +0200 |
| commit | 568c8df66fcc3ba14d3f54882ad6c4744113f03c (patch) | |
| tree | b31efe87992c46faf259391b0e60e587ac58674f /patches | |
| parent | gen_initramfs.sh: Refactor append_splash (diff) | |
| download | genkernel-568c8df66fcc3ba14d3f54882ad6c4744113f03c.tar.gz genkernel-568c8df66fcc3ba14d3f54882ad6c4744113f03c.tar.bz2 genkernel-568c8df66fcc3ba14d3f54882ad6c4744113f03c.zip | |
Rework --btrfs support
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/btrfs-progs/5.1.1/btrfs-lzo2.patch | 24 | ||||
| -rw-r--r-- | patches/btrfs-progs/5.1.1/btrfs-m4.patch | 14 |
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 0000000..67b31f7 --- /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 0000000..831ff99 --- /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 |