blob: 11a7e180be8cb5c6e9d6809c08507afda02b7ff8 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
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
@@ -258,7 +258,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()) {
|
