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:17 +0100 |
| commit | fe6ca47a256b775e1aa5750b9dd31e27230cf781 (patch) | |
| tree | d5e454a43ab4a96c1b55b467f718b55282465977 | |
| parent | 4a407568472d3c87cd2ce11baf199568249640b6 (diff) | |
| download | openembedded-core-fe6ca47a256b775e1aa5750b9dd31e27230cf781.tar.gz openembedded-core-fe6ca47a256b775e1aa5750b9dd31e27230cf781.tar.bz2 openembedded-core-fe6ca47a256b775e1aa5750b9dd31e27230cf781.zip | |
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.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/cmake/cmake-native_2.8.11.2.bb | 5 | ||||
| -rw-r--r-- | meta/recipes-devtools/cmake/cmake/cmlibarchive-disable-ext2fs.patch | 26 |
2 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-devtools/cmake/cmake-native_2.8.11.2.bb b/meta/recipes-devtools/cmake/cmake-native_2.8.11.2.bb index ab31049fac..e2a157b132 100644 --- a/meta/recipes-devtools/cmake/cmake-native_2.8.11.2.bb +++ b/meta/recipes-devtools/cmake/cmake-native_2.8.11.2.bb @@ -1,5 +1,10 @@ require cmake.inc inherit native +# Using cmake's internal libarchive, so some dependencies are needed +DEPENDS += "bzip2-native zlib-native" + +SRC_URI += "file://cmlibarchive-disable-ext2fs.patch" + SRC_URI[md5sum] = "6f5d7b8e7534a5d9e1a7664ba63cf882" SRC_URI[sha256sum] = "b32acb483afdd14339941c6e4ec25f633d916a7a472653a0b00838771a6c0562" 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 @@ +Disable use of ext2fs/ext2_fs.h by cmake's internal libarchive copy + +We don't want to add a dependency on e2fsprogs-native for cmake-native, +and we don't use CPack so just disable this functionality. + +Upstream-Status: Inappropriate [config] + +Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> + +--- a/Utilities/cmlibarchive/CMakeLists.txt ++++ b/Utilities/cmlibarchive/CMakeLists.txt +@@ -237,12 +237,8 @@ LA_CHECK_INCLUDE_FILE("copyfile.h" HAVE_COPYFILE_H) + LA_CHECK_INCLUDE_FILE("direct.h" HAVE_DIRECT_H) + LA_CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H) + LA_CHECK_INCLUDE_FILE("errno.h" HAVE_ERRNO_H) +-LA_CHECK_INCLUDE_FILE("ext2fs/ext2_fs.h" HAVE_EXT2FS_EXT2_FS_H) +- +-CHECK_C_SOURCE_COMPILES("#include <sys/ioctl.h> +-#include <ext2fs/ext2_fs.h> +-int main(void) { return EXT2_IOC_GETFLAGS; }" HAVE_WORKING_EXT2_IOC_GETFLAGS) +- ++SET(HAVE_EXT2FS_EXT2_FS_H 0) ++SET(HAVE_WORKING_EXT2_IOC_GETFLAGS 0) + LA_CHECK_INCLUDE_FILE("fcntl.h" HAVE_FCNTL_H) + LA_CHECK_INCLUDE_FILE("grp.h" HAVE_GRP_H) + LA_CHECK_INCLUDE_FILE("inttypes.h" HAVE_INTTYPES_H) |