summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/cmake/cmake/cmlibarchive-disable-ext2fs.patch
diff options
context:
space:
mode:
authorTudor Florea <tudor.florea@enea.com>2014-10-16 03:05:19 +0200
committerTudor Florea <tudor.florea@enea.com>2014-10-16 03:05:19 +0200
commitc527fd1f14c27855a37f2e8ac5346ce8d940ced2 (patch)
treebb002c1fdf011c41dbd2f0927bed23ecb5f83c97 /meta/recipes-devtools/cmake/cmake/cmlibarchive-disable-ext2fs.patch
downloadpoky-daisy-140929.tar.gz
initial commit for Enea Linux 4.0-140929daisy-140929
Migrated from the internal git server on the daisy-enea-point-release branch Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta/recipes-devtools/cmake/cmake/cmlibarchive-disable-ext2fs.patch')
-rw-r--r--meta/recipes-devtools/cmake/cmake/cmlibarchive-disable-ext2fs.patch26
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 @@
1Disable use of ext2fs/ext2_fs.h by cmake's internal libarchive copy
2
3We don't want to add a dependency on e2fsprogs-native for cmake-native,
4and we don't use CPack so just disable this functionality.
5
6Upstream-Status: Inappropriate [config]
7
8Signed-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)