diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2018-07-05 11:18:33 -0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-06 22:55:02 +0100 |
commit | 87b9992ae710cc405b1e4a07a5bfc7a283e80664 (patch) | |
tree | cf6c982da619b7992fbc5606d86c98f1c227656b /meta/recipes-devtools/cmake/cmake/cmlibarchive-disable-ext2fs.patch | |
parent | 93e9729569963355e2cb5526f9613f117205d1d3 (diff) | |
download | poky-87b9992ae710cc405b1e4a07a5bfc7a283e80664.tar.gz |
cmake: Update 3.10.3 -> 3.11.4
This updates CMake to the current stable release and drop many
backported patches in the process.
(From OE-Core rev: d942ec4ff649782d22afe49fd48839dbbfedc871)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/cmake/cmake/cmlibarchive-disable-ext2fs.patch')
-rw-r--r-- | meta/recipes-devtools/cmake/cmake/cmlibarchive-disable-ext2fs.patch | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/meta/recipes-devtools/cmake/cmake/cmlibarchive-disable-ext2fs.patch b/meta/recipes-devtools/cmake/cmake/cmlibarchive-disable-ext2fs.patch deleted file mode 100644 index bf3671259e..0000000000 --- a/meta/recipes-devtools/cmake/cmake/cmlibarchive-disable-ext2fs.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
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) | ||