summaryrefslogtreecommitdiffstats
path: root/source/ap/squashfs-tools
diff options
context:
space:
mode:
Diffstat (limited to 'source/ap/squashfs-tools')
-rwxr-xr-xsource/ap/squashfs-tools/squashfs-tools.SlackBuild4
-rw-r--r--source/ap/squashfs-tools/squashfs-tools.glibc228.diff20
2 files changed, 23 insertions, 1 deletions
diff --git a/source/ap/squashfs-tools/squashfs-tools.SlackBuild b/source/ap/squashfs-tools/squashfs-tools.SlackBuild
index 2141b1436..3c06680a6 100755
--- a/source/ap/squashfs-tools/squashfs-tools.SlackBuild
+++ b/source/ap/squashfs-tools/squashfs-tools.SlackBuild
@@ -45,7 +45,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
exit 0
fi
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
@@ -78,6 +78,8 @@ rm -rf ${PKGNAM}-${VERSION}
tar xvf $CWD/${PKGNAM}-${VERSION}.tar.?z || exit 1
cd ${PKGNAM}-${VERSION} || exit 1
+zcat $CWD/squashfs-tools.glibc228.diff.gz | patch -p1 --verbose || exit 1
+
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/source/ap/squashfs-tools/squashfs-tools.glibc228.diff b/source/ap/squashfs-tools/squashfs-tools.glibc228.diff
new file mode 100644
index 000000000..305a118d2
--- /dev/null
+++ b/source/ap/squashfs-tools/squashfs-tools.glibc228.diff
@@ -0,0 +1,20 @@
+--- ./squashfs-tools/unsquashfs.c.orig 2018-09-13 16:02:16.000000000 -0500
++++ ./squashfs-tools/unsquashfs.c 2018-09-18 19:03:26.607071388 -0500
+@@ -36,6 +36,7 @@
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <sys/resource.h>
++#include <sys/sysmacros.h>
+ #include <limits.h>
+ #include <ctype.h>
+
+--- ./squashfs-tools/mksquashfs.c.orig 2018-09-13 16:02:16.000000000 -0500
++++ ./squashfs-tools/mksquashfs.c 2018-09-18 19:03:26.605071388 -0500
+@@ -44,6 +44,7 @@
+ #include <setjmp.h>
+ #include <sys/types.h>
+ #include <sys/mman.h>
++#include <sys/sysmacros.h>
+ #include <pthread.h>
+ #include <regex.h>
+ #include <sys/wait.h>