Skip to contentSkip to conversation

package/squashfs: fix musl build

PATCH New Bernd Kuhls 2 participants 2 messages Jan 31, 2016 – Feb 1, 2016

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH 1/1 package/squashfs: fix musl build

The build errors were not yet found by the autobuilders:

action.c: In function ?name_fn?:
action.c:1911:29: error: ?FNM_EXTMATCH? undeclared (first use in this function)

     FNM_PATHNAME|FNM_PERIOD|FNM_EXTMATCH) == 0;)
                             ^
pseudo.c: In function ?read_pseudo_def?:
pseudo.c:435:11: error: ?S_IFBLK? undeclared (first use in this function)
   mode |= S_IFBLK;
           ^
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/squashfs/0001-musl.patch | 71 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 package/squashfs/0001-musl.patch
package/squashfs/0001-musl.patch new file +71 -0
new file mode 100644
index 0000000..891b171
@@ -0,0 +1,71 @@
+Fix musl build
+
+Downloaded from
+http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-devtools/squashfs-tools/squashfs-tools/fix-compat.patch
+and adjusted paths.
+
+Signed-off-by: Bernd Kuhls <[email protected]>
+
+Define FNM_EXTMATCH if not defined its glibc specific define
+include missing sys/stat.h for stat* function declarations
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <[email protected]>
+
+Index: squashfs-tools/action.c
+===================================================================
+--- a/squashfs-tools.orig/action.c
++++ b/squashfs-tools/action.c
+@@ -44,6 +44,10 @@
+ #include "action.h"
+ #include "error.h"
+ 
++#if !defined(FNM_EXTMATCH)
++#define FNM_EXTMATCH 0
++#endif
++
+ /*
+  * code to parse actions
+  */
+Index: squashfs-tools/mksquashfs.c
+===================================================================
+--- a/squashfs-tools.orig/mksquashfs.c
++++ b/squashfs-tools/mksquashfs.c
+@@ -1286,6 +1286,10 @@ void write_dir(squashfs_inode *inode, st
+ 		dir_size + 3, directory_block, directory_offset, NULL, NULL,
+ 		dir, 0);
+ 
++#if !defined(FNM_EXTMATCH)
++#define FNM_EXTMATCH 0
++#endif
++
+ #ifdef SQUASHFS_TRACE
+ 	{
+ 		unsigned char *dirp;
+Index: squashfs-tools/pseudo.c
+===================================================================
+--- a/squashfs-tools.orig/pseudo.c
++++ b/squashfs-tools/pseudo.c
+@@ -32,6 +32,7 @@
+ #include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
++#include <sys/stat.h>
+ #include <ctype.h>
+ 
+ #include "pseudo.h"
+Index: squashfs-tools/unsquashfs.c
+===================================================================
+--- a/squashfs-tools.orig/unsquashfs.c
++++ b/squashfs-tools/unsquashfs.c
+@@ -38,6 +38,10 @@
+ #include <limits.h>
+ #include <ctype.h>
+ 
++#ifndef FNM_EXTMATCH
++#define FNM_EXTMATCH 0
++#endif
++
+ struct cache *fragment_cache, *data_cache;
+ struct queue *to_reader, *to_inflate, *to_writer, *from_writer;
+ pthread_t *thread, *inflator_thread;
Signature · 1 line
2.7.0
#1 lore raw

PATCH 1/1 package/squashfs: fix musl build

Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Bernd" == Bernd Kuhls <[email protected]> writes:

The build errors were not yet found by the autobuilders:
action.c: In function ?name_fn?:
action.c:1911:29: error: ?FNM_EXTMATCH? undeclared (first use in this function)

Quoted 8 lines
     FNM_PATHNAME|FNM_PERIOD|FNM_EXTMATCH) == 0;)
                             ^
pseudo.c: In function ?read_pseudo_def?:
pseudo.c:435:11: error: ?S_IFBLK? undeclared (first use in this function)
   mode |= S_IFBLK;
           ^
Signed-off-by Bernd Kuhls <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard