blob: d6f7308fe0c18347db35bf62f36cb22824c68064 [file] [log] [blame]
Andrew Geisslerc9f78652020-09-18 14:11:35 -05001From fd9a04c1434e12f21c043385e306e0b52d38d749 Mon Sep 17 00:00:00 2001
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08002From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Thu, 5 Jul 2018 10:28:04 -0300
Andrew Geisslerc9f78652020-09-18 14:11:35 -05004Subject: [PATCH] Disable use of ext2fs/ext2_fs.h by cmake's internal
5
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08006 libarchive copy
7Organization: O.S. Systems Software LTDA.
8
9We don't want to add a dependency on e2fsprogs-native for cmake-native,
10and we don't use CPack so just disable this functionality.
11
12Upstream-Status: Inappropriate [config]
13
14Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
15Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Andrew Geisslerc9f78652020-09-18 14:11:35 -050016
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080017---
18 Utilities/cmlibarchive/CMakeLists.txt | 8 ++------
19 1 file changed, 2 insertions(+), 6 deletions(-)
20
21diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt
Andrew Geisslerc9f78652020-09-18 14:11:35 -050022index bfcaf30..2960683 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080023--- a/Utilities/cmlibarchive/CMakeLists.txt
24+++ b/Utilities/cmlibarchive/CMakeLists.txt
Andrew Geisslerc9f78652020-09-18 14:11:35 -050025@@ -682,12 +682,8 @@ LA_CHECK_INCLUDE_FILE("copyfile.h" HAVE_COPYFILE_H)
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080026 LA_CHECK_INCLUDE_FILE("direct.h" HAVE_DIRECT_H)
27 LA_CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H)
28 LA_CHECK_INCLUDE_FILE("errno.h" HAVE_ERRNO_H)
29-LA_CHECK_INCLUDE_FILE("ext2fs/ext2_fs.h" HAVE_EXT2FS_EXT2_FS_H)
30-
31-CHECK_C_SOURCE_COMPILES("#include <sys/ioctl.h>
32-#include <ext2fs/ext2_fs.h>
33-int main(void) { return EXT2_IOC_GETFLAGS; }" HAVE_WORKING_EXT2_IOC_GETFLAGS)
34-
35+SET(HAVE_EXT2FS_EXT2_FS_H 0)
36+SET(HAVE_WORKING_EXT2_IOC_GETFLAGS 0)
37 LA_CHECK_INCLUDE_FILE("fcntl.h" HAVE_FCNTL_H)
38 LA_CHECK_INCLUDE_FILE("grp.h" HAVE_GRP_H)
Andrew Geisslerc9f78652020-09-18 14:11:35 -050039 LA_CHECK_INCLUDE_FILE("io.h" HAVE_IO_H)