blob: ad42d409d925a3dff799dfc7d5fd79365a16c474 [file] [log] [blame]
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08001From 0df8d46d14c371f21c327966a553c4c187a8acfe Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Thu, 5 Jul 2018 10:28:04 -0300
4Subject: [PATCH 5/5] Disable use of ext2fs/ext2_fs.h by cmake's internal
5 libarchive copy
6Organization: O.S. Systems Software LTDA.
7
8We don't want to add a dependency on e2fsprogs-native for cmake-native,
9and we don't use CPack so just disable this functionality.
10
11Upstream-Status: Inappropriate [config]
12
13Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
14Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
15---
16 Utilities/cmlibarchive/CMakeLists.txt | 8 ++------
17 1 file changed, 2 insertions(+), 6 deletions(-)
18
19diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt
20index 206f3c6a5..642fb0dd9 100644
21--- a/Utilities/cmlibarchive/CMakeLists.txt
22+++ b/Utilities/cmlibarchive/CMakeLists.txt
Brad Bishop19323692019-04-05 15:28:33 -040023@@ -430,12 +430,8 @@ LA_CHECK_INCLUDE_FILE("copyfile.h" HAVE_COPYFILE_H)
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080024 LA_CHECK_INCLUDE_FILE("direct.h" HAVE_DIRECT_H)
25 LA_CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H)
26 LA_CHECK_INCLUDE_FILE("errno.h" HAVE_ERRNO_H)
27-LA_CHECK_INCLUDE_FILE("ext2fs/ext2_fs.h" HAVE_EXT2FS_EXT2_FS_H)
28-
29-CHECK_C_SOURCE_COMPILES("#include <sys/ioctl.h>
30-#include <ext2fs/ext2_fs.h>
31-int main(void) { return EXT2_IOC_GETFLAGS; }" HAVE_WORKING_EXT2_IOC_GETFLAGS)
32-
33+SET(HAVE_EXT2FS_EXT2_FS_H 0)
34+SET(HAVE_WORKING_EXT2_IOC_GETFLAGS 0)
35 LA_CHECK_INCLUDE_FILE("fcntl.h" HAVE_FCNTL_H)
36 LA_CHECK_INCLUDE_FILE("grp.h" HAVE_GRP_H)
37 LA_CHECK_INCLUDE_FILE("inttypes.h" HAVE_INTTYPES_H)
38--
392.18.0
40