2016-06-24 15:37:40 +00:00
|
|
|
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
|
2017-02-06 19:05:36 +00:00
|
|
|
@@ -258,7 +258,7 @@ int check_plausibility(const char *devic
|
2016-06-24 15:37:40 +00:00
|
|
|
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()) {
|
