mirror of
https://git.yoctoproject.org/poky
synced 2026-02-10 02:33:02 +01:00
1db33e3c4d
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>
27 lines
1.0 KiB
Diff
27 lines
1.0 KiB
Diff
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)
|