Andrew Geissler | c9f7865 | 2020-09-18 14:11:35 -0500 | [diff] [blame^] | 1 | From fd9a04c1434e12f21c043385e306e0b52d38d749 Mon Sep 17 00:00:00 2001 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 2 | From: Otavio Salvador <otavio@ossystems.com.br> |
| 3 | Date: Thu, 5 Jul 2018 10:28:04 -0300 |
Andrew Geissler | c9f7865 | 2020-09-18 14:11:35 -0500 | [diff] [blame^] | 4 | Subject: [PATCH] Disable use of ext2fs/ext2_fs.h by cmake's internal |
| 5 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 6 | libarchive copy |
| 7 | Organization: O.S. Systems Software LTDA. |
| 8 | |
| 9 | We don't want to add a dependency on e2fsprogs-native for cmake-native, |
| 10 | and we don't use CPack so just disable this functionality. |
| 11 | |
| 12 | Upstream-Status: Inappropriate [config] |
| 13 | |
| 14 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> |
| 15 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> |
Andrew Geissler | c9f7865 | 2020-09-18 14:11:35 -0500 | [diff] [blame^] | 16 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 17 | --- |
| 18 | Utilities/cmlibarchive/CMakeLists.txt | 8 ++------ |
| 19 | 1 file changed, 2 insertions(+), 6 deletions(-) |
| 20 | |
| 21 | diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt |
Andrew Geissler | c9f7865 | 2020-09-18 14:11:35 -0500 | [diff] [blame^] | 22 | index bfcaf30..2960683 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 23 | --- a/Utilities/cmlibarchive/CMakeLists.txt |
| 24 | +++ b/Utilities/cmlibarchive/CMakeLists.txt |
Andrew Geissler | c9f7865 | 2020-09-18 14:11:35 -0500 | [diff] [blame^] | 25 | @@ -682,12 +682,8 @@ LA_CHECK_INCLUDE_FILE("copyfile.h" HAVE_COPYFILE_H) |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 26 | 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 Geissler | c9f7865 | 2020-09-18 14:11:35 -0500 | [diff] [blame^] | 39 | LA_CHECK_INCLUDE_FILE("io.h" HAVE_IO_H) |