[LEDE-DEV] [PATCH] e2fsprogs: fix build problem with very old libmagic

Hauke Mehrtens hauke at hauke-m.de
Wed Jun 29 14:14:36 PDT 2016


From: Hauke Mehrtens <hauke.mehrtens at intel.com>

The libmagic shipped with RedHat 5 does not define
MAGIC_NO_CHECK_COMPRESS and MAGIC_NO_CHECK_COMPRESS. e2fsprogs should
check for that otherwise the build will fail.

Signed-off-by: Hauke Mehrtens <hauke.mehrtens at intel.com>
---
 tools/e2fsprogs/patches/010-old-libmagic.patch | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 tools/e2fsprogs/patches/010-old-libmagic.patch

diff --git a/tools/e2fsprogs/patches/010-old-libmagic.patch b/tools/e2fsprogs/patches/010-old-libmagic.patch
new file mode 100644
index 0000000..5ba8a54
--- /dev/null
+++ b/tools/e2fsprogs/patches/010-old-libmagic.patch
@@ -0,0 +1,11 @@
+--- a/lib/support/plausible.c
++++ b/lib/support/plausible.c
+@@ -247,7 +247,7 @@ int check_plausibility(const char *devic
+ 		return 0;
+ 	}
+ 
+-#ifdef HAVE_MAGIC_H
++#if defined(HAVE_MAGIC_H) && defined(MAGIC_NO_CHECK_COMPRESS) && defined(MAGIC_NO_CHECK_COMPRESS)
+ 	if ((flags & CHECK_FS_EXIST) &&
+ 	    !getenv("E2FSPROGS_LIBMAGIC_SUPPRESS") &&
+ 	    magic_library_available()) {
-- 
2.8.1




More information about the Lede-dev mailing list