summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-11-18 23:25:24 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-12 23:42:55 +0000
commit1b90d675aed65de320c108f0250945414e56f5f7 (patch)
treeb848cfee3c813e9b29ebb1d5d0d91e2d53114275 /meta/recipes-devtools
parent36a709aa0f232a1887cf60f2eaf0a44fdd707ecd (diff)
downloadpoky-1b90d675aed65de320c108f0250945414e56f5f7.tar.gz
squashfs-tools: Define FNM_EXTMATCH if not defined
helps compiling when using musl (From OE-Core rev: 860db06bb437c936eb5743f75c865bb70fc3ef92) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/squashfs-tools/squashfs-tools/fix-compat.patch63
-rw-r--r--meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb1
2 files changed, 64 insertions, 0 deletions
diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools/fix-compat.patch b/meta/recipes-devtools/squashfs-tools/squashfs-tools/fix-compat.patch
new file mode 100644
index 0000000000..d545146912
--- /dev/null
+++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools/fix-compat.patch
@@ -0,0 +1,63 @@
1Define FNM_EXTMATCH if not defined its glibc specific define
2include missing sys/stat.h for stat* function declarations
3
4Upstream-Status: Pending
5Signed-off-by: Khem Raj <raj.khem@gmail.com>
6
7Index: squashfs-tools/action.c
8===================================================================
9--- squashfs-tools.orig/action.c
10+++ squashfs-tools/action.c
11@@ -44,6 +44,10 @@
12 #include "action.h"
13 #include "error.h"
14
15+#if !defined(FNM_EXTMATCH)
16+#define FNM_EXTMATCH 0
17+#endif
18+
19 /*
20 * code to parse actions
21 */
22Index: squashfs-tools/mksquashfs.c
23===================================================================
24--- squashfs-tools.orig/mksquashfs.c
25+++ squashfs-tools/mksquashfs.c
26@@ -1286,6 +1286,10 @@ void write_dir(squashfs_inode *inode, st
27 dir_size + 3, directory_block, directory_offset, NULL, NULL,
28 dir, 0);
29
30+#if !defined(FNM_EXTMATCH)
31+#define FNM_EXTMATCH 0
32+#endif
33+
34 #ifdef SQUASHFS_TRACE
35 {
36 unsigned char *dirp;
37Index: squashfs-tools/pseudo.c
38===================================================================
39--- squashfs-tools.orig/pseudo.c
40+++ squashfs-tools/pseudo.c
41@@ -32,6 +32,7 @@
42 #include <stdlib.h>
43 #include <sys/types.h>
44 #include <sys/wait.h>
45+#include <sys/stat.h>
46 #include <ctype.h>
47
48 #include "pseudo.h"
49Index: squashfs-tools/unsquashfs.c
50===================================================================
51--- squashfs-tools.orig/unsquashfs.c
52+++ squashfs-tools/unsquashfs.c
53@@ -38,6 +38,10 @@
54 #include <limits.h>
55 #include <ctype.h>
56
57+#ifndef FNM_EXTMATCH
58+#define FNM_EXTMATCH 0
59+#endif
60+
61 struct cache *fragment_cache, *data_cache;
62 struct queue *to_reader, *to_inflate, *to_writer, *from_writer;
63 pthread_t *thread, *inflator_thread;
diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
index 7aebd00e0b..33ed09ae8a 100644
--- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
+++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
@@ -13,6 +13,7 @@ SRCREV = "9c1db6d13a51a2e009f0027ef336ce03624eac0d"
13SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https \ 13SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https \
14 http://downloads.sourceforge.net/sevenzip/lzma465.tar.bz2;name=lzma \ 14 http://downloads.sourceforge.net/sevenzip/lzma465.tar.bz2;name=lzma \
15 file://0001-mksquashfs.c-get-inline-functions-work-with-C99.patch;striplevel=2 \ 15 file://0001-mksquashfs.c-get-inline-functions-work-with-C99.patch;striplevel=2 \
16 file://fix-compat.patch \
16" 17"
17SRC_URI[lzma.md5sum] = "29d5ffd03a5a3e51aef6a74e9eafb759" 18SRC_URI[lzma.md5sum] = "29d5ffd03a5a3e51aef6a74e9eafb759"
18SRC_URI[lzma.sha256sum] = "c935fd04dd8e0e8c688a3078f3675d699679a90be81c12686837e0880aa0fa1e" 19SRC_URI[lzma.sha256sum] = "c935fd04dd8e0e8c688a3078f3675d699679a90be81c12686837e0880aa0fa1e"