[source] e2fsprogs: fix build problem with very old libmagic

LEDE Commits lede-commits at lists.infradead.org
Thu Jun 30 11:52:07 PDT 2016


hauke pushed a commit to source.git, branch master:
https://git.lede-project.org/?p=source.git;a=commitdiff;h=d635ef50c5cb9aaca718b6418feea378b450c3a8

commit d635ef50c5cb9aaca718b6418feea378b450c3a8
Author: Hauke Mehrtens <hauke.mehrtens at intel.com>
AuthorDate: Fri Jun 24 17:37:40 2016 +0200

    e2fsprogs: fix build problem with very old libmagic
    
    The libmagic shipped with RedHat 5 does not define
    MAGIC_NO_CHECK_ELF 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 | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/tools/e2fsprogs/patches/010-old-libmagic.patch b/tools/e2fsprogs/patches/010-old-libmagic.patch
new file mode 100644
index 0000000..9156b73
--- /dev/null
+++ b/tools/e2fsprogs/patches/010-old-libmagic.patch
@@ -0,0 +1,25 @@
+From b482eb7af94885b6bbad9329e40702c958d5b448 Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke at hauke-m.de>
+Date: Thu, 30 Jun 2016 19:53:03 +0200
+Subject: [PATCH] fix build problem with very old libmagic
+
+The libmagic shipped with RedHat 5 does not define
+MAGIC_NO_CHECK_ELF and MAGIC_NO_CHECK_COMPRESS. e2fsprogs should
+check for that otherwise the build will fail.
+
+Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
+---
+ lib/support/plausible.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- 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_ELF) && defined(MAGIC_NO_CHECK_COMPRESS)
+ 	if ((flags & CHECK_FS_EXIST) &&
+ 	    !getenv("E2FSPROGS_LIBMAGIC_SUPPRESS") &&
+ 	    magic_library_available()) {



More information about the lede-commits mailing list