squashfs-tools: unbreak musl builds (patch from Alpine).
This commit is contained in:
parent
159e44f8bd
commit
30d36452b6
2 changed files with 49 additions and 3 deletions
46
srcpkgs/squashfs-tools/patches/fix-compat.patch
Normal file
46
srcpkgs/squashfs-tools/patches/fix-compat.patch
Normal file
|
@ -0,0 +1,46 @@
|
||||||
|
--- squashfs-tools/action.c
|
||||||
|
+++ squashfs-tools/action.c
|
||||||
|
@@ -1905,6 +1905,9 @@
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
+#ifndef FNM_EXTMATCH
|
||||||
|
+#define FNM_EXTMATCH 0
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
TEST_FN(name, ACTION_ALL_LNK, \
|
||||||
|
return fnmatch(atom->argv[0], action_data->name,
|
||||||
|
--- squashfs-tools/mksquashfs.c
|
||||||
|
+++ squashfs-tools/mksquashfs.c
|
||||||
|
@@ -4391,6 +4391,9 @@
|
||||||
|
return paths;
|
||||||
|
}
|
||||||
|
|
||||||
|
+#ifndef FNM_EXTMATCH
|
||||||
|
+#define FNM_EXTMATCH 0
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
int excluded_match(char *name, struct pathname *path, struct pathnames **new)
|
||||||
|
{
|
||||||
|
--- squashfs-tools/pseudo.c
|
||||||
|
+++ 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"
|
||||||
|
--- squashfs-tools/unsquashfs.c
|
||||||
|
+++ squashfs-tools/unsquashfs.c
|
||||||
|
@@ -1410,6 +1410,9 @@
|
||||||
|
free(paths);
|
||||||
|
}
|
||||||
|
|
||||||
|
+#ifndef FNM_EXTMATCH
|
||||||
|
+#define FNM_EXTMATCH 0
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
int matches(struct pathnames *paths, char *name, struct pathnames **new)
|
||||||
|
{
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'squashfs-tools'
|
# Template file for 'squashfs-tools'
|
||||||
pkgname=squashfs-tools
|
pkgname=squashfs-tools
|
||||||
version=4.3
|
version=4.3
|
||||||
revision=1
|
revision=2
|
||||||
wrksrc="squashfs${version}"
|
wrksrc="squashfs${version}"
|
||||||
makedepends="zlib-devel lzo-devel liblzma-devel"
|
makedepends="zlib-devel lzo-devel liblzma-devel"
|
||||||
license="GPL"
|
license="GPL"
|
||||||
|
@ -16,6 +16,6 @@ do_build() {
|
||||||
make -C ${pkgname} ${makejobs} XZ_SUPPORT=1 LZO_SUPPORT=1 LZMA_XZ_SUPPORT=1
|
make -C ${pkgname} ${makejobs} XZ_SUPPORT=1 LZO_SUPPORT=1 LZMA_XZ_SUPPORT=1
|
||||||
}
|
}
|
||||||
do_install() {
|
do_install() {
|
||||||
vmkdir usr/bin
|
vbin ${pkgname}/mksquashfs
|
||||||
install -m755 ${pkgname}/{mk,un}squashfs ${DESTDIR}/usr/bin
|
vbin ${pkgname}/unsquashfs
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue