diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-09-17 14:57:46 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-17 20:53:20 +0100 |
commit | 1db33e3c4dd7f50c7141f30949216457056b09dd (patch) | |
tree | f506204dad14f5e36e2eac705c3c2691b1f251a2 /meta/recipes-devtools/cmake/cmake | |
parent | 442be3ef60394f46bdba9f747c46bff288a4d401 (diff) | |
download | poky-1db33e3c4dd7f50c7141f30949216457056b09dd.tar.gz |
cmake-native: fix dependencies
When building cmake for native, we don't use the system libraries and
thus cmake builds its own internal version of libarchive; this requires
zlib, bzip2, and e2fsprogs. We can add to DEPENDS for the two former
libraries and patch out the latter.
(From OE-Core rev: fe6ca47a256b775e1aa5750b9dd31e27230cf781)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/cmake/cmake')
-rw-r--r-- | meta/recipes-devtools/cmake/cmake/cmlibarchive-disable-ext2fs.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/meta/recipes-devtools/cmake/cmake/cmlibarchive-disable-ext2fs.patch b/meta/recipes-devtools/cmake/cmake/cmlibarchive-disable-ext2fs.patch new file mode 100644 index 0000000000..bf3671259e --- /dev/null +++ b/meta/recipes-devtools/cmake/cmake/cmlibarchive-disable-ext2fs.patch | |||
@@ -0,0 +1,26 @@ | |||
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) | ||