Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Disable use of ext2fs/ext2_fs.h by cmake's internal libarchive copy |
| 2 | |
| 3 | We don't want to add a dependency on e2fsprogs-native for cmake-native, |
| 4 | and we don't use CPack so just disable this functionality. |
| 5 | |
| 6 | Upstream-Status: Inappropriate [config] |
| 7 | |
| 8 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> |
| 9 | |
| 10 | --- a/Utilities/cmlibarchive/CMakeLists.txt |
| 11 | +++ b/Utilities/cmlibarchive/CMakeLists.txt |
| 12 | @@ -237,12 +237,8 @@ LA_CHECK_INCLUDE_FILE("copyfile.h" HAVE_COPYFILE_H) |
| 13 | LA_CHECK_INCLUDE_FILE("direct.h" HAVE_DIRECT_H) |
| 14 | LA_CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H) |
| 15 | LA_CHECK_INCLUDE_FILE("errno.h" HAVE_ERRNO_H) |
| 16 | -LA_CHECK_INCLUDE_FILE("ext2fs/ext2_fs.h" HAVE_EXT2FS_EXT2_FS_H) |
| 17 | - |
| 18 | -CHECK_C_SOURCE_COMPILES("#include <sys/ioctl.h> |
| 19 | -#include <ext2fs/ext2_fs.h> |
| 20 | -int main(void) { return EXT2_IOC_GETFLAGS; }" HAVE_WORKING_EXT2_IOC_GETFLAGS) |
| 21 | - |
| 22 | +SET(HAVE_EXT2FS_EXT2_FS_H 0) |
| 23 | +SET(HAVE_WORKING_EXT2_IOC_GETFLAGS 0) |
| 24 | LA_CHECK_INCLUDE_FILE("fcntl.h" HAVE_FCNTL_H) |
| 25 | LA_CHECK_INCLUDE_FILE("grp.h" HAVE_GRP_H) |
| 26 | LA_CHECK_INCLUDE_FILE("inttypes.h" HAVE_INTTYPES_H) |