EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

e2fsprogs: fix build problem with very old libmagic

Browse Source 
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@intel.com>
This commit is contained in:
Hauke Mehrtens 2016-06-24 17:37:40 +02:00 committed by Hauke Mehrtens
parent ffcae8b494
commit d635ef50c5
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tools/e2fsprogs/patches/010-old-libmagic.patch Normal file
View File

@ -0,0 +1,25 @@
From b482eb7af94885b6bbad9329e40702c958d5b448 Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@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@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()) {