diff options
Diffstat (limited to 'meta/recipes-devtools/cmake/cmake/0004-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch')
-rw-r--r-- | meta/recipes-devtools/cmake/cmake/0004-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/meta/recipes-devtools/cmake/cmake/0004-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch b/meta/recipes-devtools/cmake/cmake/0004-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch new file mode 100644 index 0000000000..91dea4cbba --- /dev/null +++ b/meta/recipes-devtools/cmake/cmake/0004-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From d9aa3f7c075dbd0db386995a44a2240ecdbb2c56 Mon Sep 17 00:00:00 2001 | ||
2 | From: Otavio Salvador <otavio@ossystems.com.br> | ||
3 | Date: Thu, 5 Jul 2018 10:28:04 -0300 | ||
4 | Subject: [PATCH 4/4] Disable use of ext2fs/ext2_fs.h by cmake's internal | ||
5 | libarchive copy | ||
6 | Organization: O.S. Systems Software LTDA. | ||
7 | |||
8 | We don't want to add a dependency on e2fsprogs-native for cmake-native, | ||
9 | and we don't use CPack so just disable this functionality. | ||
10 | |||
11 | Upstream-Status: Inappropriate [config] | ||
12 | |||
13 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
14 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
15 | --- | ||
16 | Utilities/cmlibarchive/CMakeLists.txt | 8 ++------ | ||
17 | 1 file changed, 2 insertions(+), 6 deletions(-) | ||
18 | |||
19 | diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt | ||
20 | index 206f3c6a5..642fb0dd9 100644 | ||
21 | --- a/Utilities/cmlibarchive/CMakeLists.txt | ||
22 | +++ b/Utilities/cmlibarchive/CMakeLists.txt | ||
23 | @@ -400,12 +400,8 @@ LA_CHECK_INCLUDE_FILE("copyfile.h" HAVE_COPYFILE_H) | ||
24 | 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 | -- | ||
39 | 2.18.0 | ||
40 | |||