diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2018-09-21 18:51:07 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2018-09-22 09:00:39 +0200 |
| commit | 48e09f463d219d8975a3fb82f2d7d52a88472a9f (patch) | |
| tree | b664168d83cb02a14256d4ecce13202a59834b20 /source/a | |
| parent | a22d1843900f65ede3f87d55207ca0b8f2a38b98 (diff) | |
| download | current-48e09f463d219d8975a3fb82f2d7d52a88472a9f.tar.gz current-48e09f463d219d8975a3fb82f2d7d52a88472a9f.tar.xz | |
Fri Sep 21 18:51:07 UTC 201820180921185107
a/eudev-3.2.6-x86_64-1.txz: Upgraded.
a/glibc-solibs-2.28-x86_64-2.txz: Upgraded.
a/grub-2.02-x86_64-3.txz: Rebuilt.
Patched to fix compatibility with recent xfsprogs. Thanks to Markus Wiesner.
a/kernel-generic-4.14.71-x86_64-1.txz: Upgraded.
a/kernel-huge-4.14.71-x86_64-1.txz: Upgraded.
a/kernel-modules-4.14.71-x86_64-1.txz: Upgraded.
ap/opus-tools-0.2-x86_64-1.txz: Upgraded.
ap/sqlite-3.25.1-x86_64-1.txz: Upgraded.
d/icecream-20180905_cdc6ff8-x86_64-1.txz: Upgraded.
d/kernel-headers-4.14.71-x86-1.txz: Upgraded.
d/llvm-7.0.0-x86_64-1.txz: Upgraded.
Shared library .so-version bump.
k/kernel-source-4.14.71-noarch-1.txz: Upgraded.
l/ffmpeg-3.4.4-x86_64-2.txz: Rebuilt.
Don't try to link with Samba since the latest version is not compatible.
l/glibc-2.28-x86_64-2.txz: Upgraded.
All packages have been patched where needed for glibc-2.28 and compile
tested here. Thanks to nobodino for the help.
l/glibc-i18n-2.28-x86_64-2.txz: Upgraded.
l/glibc-profile-2.28-x86_64-2.txz: Upgraded.
l/gst-plugins-base-1.14.3-x86_64-1.txz: Upgraded.
l/gst-plugins-good-1.14.3-x86_64-1.txz: Upgraded.
l/gst-plugins-libav-1.14.3-x86_64-1.txz: Upgraded.
l/gstreamer-1.14.3-x86_64-1.txz: Upgraded.
l/imagemagick-6.9.10_11-x86_64-1.txz: Upgraded.
l/libopusenc-0.2-x86_64-1.txz: Added.
l/librsvg-2.44.3-x86_64-1.txz: Upgraded.
l/opus-1.3_rc2-x86_64-1.txz: Upgraded.
l/opusfile-0.11-x86_64-1.txz: Upgraded.
l/soprano-2.9.4-x86_64-3.txz: Rebuilt.
Recompiled to drop virtuoso dependency.
l/virtuoso-ose-6.1.8-x86_64-9.txz: Removed.
Even KDE4 has migrated away from actually using this for anything. The last
thing in Slackware that was dependent on it was Soprano, which has been
recompiled to no longer use it.
n/postfix-3.3.1-x86_64-2.txz: Rebuilt.
Recompiled so that it quits whining about OpenSSL. Thanks to shastah.
x/mesa-18.2.1-x86_64-1.txz: Upgraded.
Compiled against llvm-7.0.0.
x/xf86-video-vmware-13.3.0-x86_64-2.txz: Rebuilt.
Recompiled against llvm-7.0.0.
x/xterm-336-x86_64-1.txz: Upgraded.
extra/pure-alsa-system/ffmpeg-3.4.4-x86_64-2_alsa.txz: Rebuilt.
Don't try to link with Samba since the latest version is not compatible.
extra/pure-alsa-system/gst-plugins-good-1.14.3-x86_64-1_alsa.txz: Upgraded.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to '')
145 files changed, 620 insertions, 129 deletions
diff --git a/source/a/acl/acl.SlackBuild b/source/a/acl/acl.SlackBuild index 9d024b207..150963507 100755 --- a/source/a/acl/acl.SlackBuild +++ b/source/a/acl/acl.SlackBuild @@ -53,7 +53,7 @@ else LIBDIRSUFFIX="" fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} rm -rf $PKG mkdir -p $TMP $PKG/usr/lib${LIBDIRSUFFIX} diff --git a/source/a/acpid/acpid.SlackBuild b/source/a/acpid/acpid.SlackBuild index 539473280..8c8ed57c4 100755 --- a/source/a/acpid/acpid.SlackBuild +++ b/source/a/acpid/acpid.SlackBuild @@ -49,7 +49,7 @@ fi TMP=${TMP:-/tmp} PKG=$TMP/package-acpid -NUMJOBS=${NUMJOBS:--j8} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" diff --git a/source/a/attr/attr.SlackBuild b/source/a/attr/attr.SlackBuild index 1254c5ca1..2a6564aa1 100755 --- a/source/a/attr/attr.SlackBuild +++ b/source/a/attr/attr.SlackBuild @@ -53,7 +53,7 @@ else LIBDIRSUFFIX="" fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} rm -rf $PKG mkdir -p $TMP $PKG diff --git a/source/a/bash/bash.SlackBuild b/source/a/bash/bash.SlackBuild index 3cf0e6cc5..35f9afd2d 100755 --- a/source/a/bash/bash.SlackBuild +++ b/source/a/bash/bash.SlackBuild @@ -45,7 +45,7 @@ if [ -z "$ARCH" ]; then esac fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mcpu=i686" diff --git a/source/a/btrfs-progs/btrfs-progs.SlackBuild b/source/a/btrfs-progs/btrfs-progs.SlackBuild index 987a29c0e..2de9fe6ae 100755 --- a/source/a/btrfs-progs/btrfs-progs.SlackBuild +++ b/source/a/btrfs-progs/btrfs-progs.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=btrfs-progs BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Download the btrfs-progs Git head if there's no tarball: if ! /bin/ls $CWD/btrfs-progs*tar* 1> /dev/null 2> /dev/null ; then diff --git a/source/a/coreutils/coreutils.SlackBuild b/source/a/coreutils/coreutils.SlackBuild index cb2823459..4b88625c8 100755 --- a/source/a/coreutils/coreutils.SlackBuild +++ b/source/a/coreutils/coreutils.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=coreutils VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:--j6} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/cpio/cpio.SlackBuild b/source/a/cpio/cpio.SlackBuild index 8441f487a..cd7ddda9b 100755 --- a/source/a/cpio/cpio.SlackBuild +++ b/source/a/cpio/cpio.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} diff --git a/source/a/dbus/dbus.SlackBuild b/source/a/dbus/dbus.SlackBuild index 4f923ef16..ffff649ba 100755 --- a/source/a/dbus/dbus.SlackBuild +++ b/source/a/dbus/dbus.SlackBuild @@ -27,7 +27,7 @@ PKGNAM=dbus VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/dosfstools/dosfstools.SlackBuild b/source/a/dosfstools/dosfstools.SlackBuild index 6bc670f8d..832b25819 100755 --- a/source/a/dosfstools/dosfstools.SlackBuild +++ b/source/a/dosfstools/dosfstools.SlackBuild @@ -44,7 +44,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" diff --git a/source/a/e2fsprogs/e2fsprogs.SlackBuild b/source/a/e2fsprogs/e2fsprogs.SlackBuild index 78f6b385e..13802d3c1 100755 --- a/source/a/e2fsprogs/e2fsprogs.SlackBuild +++ b/source/a/e2fsprogs/e2fsprogs.SlackBuild @@ -28,7 +28,7 @@ PKGNAM=e2fsprogs VERSION=${VERSION:-$(echo e2fsprogs*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) diff --git a/source/a/ed/ed.SlackBuild b/source/a/ed/ed.SlackBuild index db4063783..7249fed52 100755 --- a/source/a/ed/ed.SlackBuild +++ b/source/a/ed/ed.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} diff --git a/source/a/efivar/efivar.SlackBuild b/source/a/efivar/efivar.SlackBuild index f954ff90d..60c1d8911 100755 --- a/source/a/efivar/efivar.SlackBuild +++ b/source/a/efivar/efivar.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" diff --git a/source/a/eudev/eudev.SlackBuild b/source/a/eudev/eudev.SlackBuild index 0c8a22d9e..cc94d7618 100755 --- a/source/a/eudev/eudev.SlackBuild +++ b/source/a/eudev/eudev.SlackBuild @@ -23,10 +23,10 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=eudev -VERSION=${VERSION:-$(echo eudev-*.tar.* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-4} +VERSION=${VERSION:-$(echo eudev-*.tar.?* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} +BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -59,7 +59,7 @@ rm -rf $PKG mkdir -p $TMP $PKG/lib/udev cd $TMP rm -rf eudev-$VERSION -tar xvf $CWD/eudev-$VERSION.tar.xz || exit 1 +tar xvf $CWD/eudev-$VERSION.tar.?z || exit 1 cd eudev-$VERSION || exit 1 chown -R root:root . find . \ diff --git a/source/a/eudev/eudev.url b/source/a/eudev/eudev.url new file mode 100644 index 000000000..1d7619f46 --- /dev/null +++ b/source/a/eudev/eudev.url @@ -0,0 +1 @@ +http://dev.gentoo.org/~blueness/eudev/ diff --git a/source/a/file/file.SlackBuild b/source/a/file/file.SlackBuild index 66056823a..fd6d63576 100755 --- a/source/a/file/file.SlackBuild +++ b/source/a/file/file.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=file VERSION=${VERSION:-$(echo file-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:--j7} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/findutils/findutils.SlackBuild b/source/a/findutils/findutils.SlackBuild index b0c0594cf..2b80de120 100755 --- a/source/a/findutils/findutils.SlackBuild +++ b/source/a/findutils/findutils.SlackBuild @@ -36,7 +36,7 @@ if [ -z "$ARCH" ]; then esac fi -NUMJOBS=${NUMJOBS:--j6} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-findutils diff --git a/source/a/floppy/fdutils.glibc228.diff b/source/a/floppy/fdutils.glibc228.diff new file mode 100644 index 000000000..98ecfeacb --- /dev/null +++ b/source/a/floppy/fdutils.glibc228.diff @@ -0,0 +1,50 @@ +--- ./src/driveprm.c.orig 2005-03-03 14:45:38.000000000 -0600 ++++ ./src/driveprm.c 2018-09-18 18:47:59.701061467 -0500 +@@ -8,6 +8,7 @@ + #include <linux/fd.h> + #include <sys/ioctl.h> + #include <linux/major.h> ++#include <sys/sysmacros.h> + #include "parse.h" + #include "driveprm.h" + #include "driveprmP.h" +--- ./src/floppymeter.c.orig 2002-11-02 07:37:12.000000000 -0600 ++++ ./src/floppymeter.c 2018-09-18 18:47:59.703061467 -0500 +@@ -14,6 +14,7 @@ + #include <fcntl.h> + #include <sys/stat.h> + #include <linux/major.h> ++#include <sys/sysmacros.h> + #include <getopt.h> + #include "enh_options.h" + #include "fdutils.h" +--- ./src/diskseekd.c.orig 2002-11-02 07:36:42.000000000 -0600 ++++ ./src/diskseekd.c 2018-09-18 18:47:59.699061467 -0500 +@@ -14,6 +14,7 @@ + #include <fcntl.h> + #include <sys/stat.h> + #include <linux/major.h> ++#include <sys/sysmacros.h> + #include "enh_options.h" + #include <sys/signal.h> + #include <errno.h> +--- ./src/xdfcopy.c.orig 2003-07-18 01:27:48.000000000 -0500 ++++ ./src/xdfcopy.c 2018-09-18 18:47:59.705061467 -0500 +@@ -18,6 +18,7 @@ + #include <fcntl.h> + #include <sys/stat.h> + #include <linux/major.h> ++#include <sys/sysmacros.h> + #include <sys/time.h> + #include <errno.h> + #include "fdutils.h" +--- ./src/superformat.c.orig 2005-03-03 15:41:05.000000000 -0600 ++++ ./src/superformat.c 2018-09-18 18:47:59.704061467 -0500 +@@ -47,6 +47,7 @@ + #include <fcntl.h> + #include <sys/stat.h> + #include <linux/major.h> ++#include <sys/sysmacros.h> + #include <errno.h> + #include "enh_options.h" + #include "mediaprm.h" diff --git a/source/a/floppy/floppy.SlackBuild b/source/a/floppy/floppy.SlackBuild index 8f2fbb06d..836e8d4d5 100755 --- a/source/a/floppy/floppy.SlackBuild +++ b/source/a/floppy/floppy.SlackBuild @@ -64,6 +64,7 @@ tar xvf $CWD/fdutils-$VERSION.tar.?z* cd fdutils-$VERSION zcat $CWD/fdutils-5.5-20081027.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 zcat $CWD/fdutils.mediaprm.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 +zcat $CWD/fdutils.glibc228.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 sed -i 's|<linux/ext2_fs.h>|<ext2fs/ext2_fs.h>|' src/fdmount.c CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/a/gawk/gawk.SlackBuild b/source/a/gawk/gawk.SlackBuild index 121339dd8..7b650d36b 100755 --- a/source/a/gawk/gawk.SlackBuild +++ b/source/a/gawk/gawk.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=gawk VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-2} -NUMJOBS=${NUMJOBS:--j6} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/gettext/gettext-tools.SlackBuild b/source/a/gettext/gettext-tools.SlackBuild index 6cf4e15f5..aa8bc699a 100755 --- a/source/a/gettext/gettext-tools.SlackBuild +++ b/source/a/gettext/gettext-tools.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=gettext-tools VERSION=0.19.8.1 BUILD=${BUILD:-5} -NUMJOBS=${NUMJOBS:-" -j6 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/gettext/gettext.SlackBuild b/source/a/gettext/gettext.SlackBuild index a05053fb2..f95e54c94 100755 --- a/source/a/gettext/gettext.SlackBuild +++ b/source/a/gettext/gettext.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=gettext VERSION=0.19.8.1 BUILD=${BUILD:-5} -NUMJOBS=${NUMJOBS:-" -j6 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/glibc-zoneinfo/glibc-zoneinfo.SlackBuild b/source/a/glibc-zoneinfo/glibc-zoneinfo.SlackBuild index a3fd514e5..283149811 100755 --- a/source/a/glibc-zoneinfo/glibc-zoneinfo.SlackBuild +++ b/source/a/glibc-zoneinfo/glibc-zoneinfo.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" = "i386" ]; then SLKCFLAGS="-DHAVE_SNPRINTF=1 -O2 -march=i386 -mcpu=i686" diff --git a/source/a/gptfdisk/gptfdisk.SlackBuild b/source/a/gptfdisk/gptfdisk.SlackBuild index d5708fc08..9afdb2dae 100755 --- a/source/a/gptfdisk/gptfdisk.SlackBuild +++ b/source/a/gptfdisk/gptfdisk.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" diff --git a/source/a/grep/grep.SlackBuild b/source/a/grep/grep.SlackBuild index 75f0e96be..bf41de0fe 100755 --- a/source/a/grep/grep.SlackBuild +++ b/source/a/grep/grep.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=grep VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-2} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/grub/grub.SlackBuild b/source/a/grub/grub.SlackBuild index d7867deba..9ece0d82b 100755 --- a/source/a/grub/grub.SlackBuild +++ b/source/a/grub/grub.SlackBuild @@ -28,7 +28,7 @@ PKGNAM=grub VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} # Better to use _ than ~ in the package filenames version: PKGVER=$(echo $VERSION | tr '~' '_') -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -49,7 +49,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i386" ]; then SLKCFLAGS="-O2 -march=i386 -mcpu=i686" @@ -115,6 +115,9 @@ zcat $CWD/0001-Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch.gz | patch # Fix alignment error with gcc8: zcat $CWD/0198-align-struct-efi_variable-better.patch.gz | patch -p1 --verbose || exit 1 +# Fix compatibility with recent xfsprogs: +zcat $CWD/grub.xfs.sparse.inodes.patch.gz | patch -p1 --verbose || exit 1 + build_grub() { EFI_DO="$*" # Configure: diff --git a/source/a/grub/grub.xfs.sparse.inodes.patch b/source/a/grub/grub.xfs.sparse.inodes.patch new file mode 100644 index 000000000..b7c8db4cb --- /dev/null +++ b/source/a/grub/grub.xfs.sparse.inodes.patch @@ -0,0 +1,61 @@ +From cda0a857dd7a27cd5d621747464bfe71e8727fff Mon Sep 17 00:00:00 2001 +From: Daniel Kiper <daniel.kiper@oracle.com> +Date: Tue, 29 May 2018 16:16:02 +0200 +Subject: xfs: Accept filesystem with sparse inodes + +The sparse inode metadata format became a mkfs.xfs default in +xfsprogs-4.16.0, and such filesystems are now rejected by grub as +containing an incompatible feature. + +In essence, this feature allows xfs to allocate inodes into fragmented +freespace. (Without this feature, if xfs could not allocate contiguous +space for 64 new inodes, inode creation would fail.) + +In practice, the disk format change is restricted to the inode btree, +which as far as I can tell is not used by grub. If all you're doing +today is parsing a directory, reading an inode number, and converting +that inode number to a disk location, then ignoring this feature +should be fine, so I've added it to XFS_SB_FEAT_INCOMPAT_SUPPORTED + +I did some brief testing of this patch by hacking up the regression +tests to completely fragment freespace on the test xfs filesystem, and +then write a large-ish number of inodes to consume any existing +contiguous 64-inode chunk. This way any files the grub tests add and +traverse would be in such a fragmented inode allocation. Tests passed, +but I'm not sure how to cleanly integrate that into the test harness. + +Signed-off-by: Eric Sandeen <sandeen@redhat.com> +Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> +Tested-by: Chris Murphy <lists@colorremedies.com> +--- + grub-core/fs/xfs.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c +index c6031bd..3b00c74 100644 +--- a/grub-core/fs/xfs.c ++++ b/grub-core/fs/xfs.c +@@ -79,9 +79,18 @@ GRUB_MOD_LICENSE ("GPLv3+"); + #define XFS_SB_FEAT_INCOMPAT_SPINODES (1 << 1) /* sparse inode chunks */ + #define XFS_SB_FEAT_INCOMPAT_META_UUID (1 << 2) /* metadata UUID */ + +-/* We do not currently verify metadata UUID so it is safe to read such filesystem */ ++/* ++ * Directory entries with ftype are explicitly handled by GRUB code. ++ * ++ * We do not currently read the inode btrees, so it is safe to read filesystems ++ * with the XFS_SB_FEAT_INCOMPAT_SPINODES feature. ++ * ++ * We do not currently verify metadata UUID, so it is safe to read filesystems ++ * with the XFS_SB_FEAT_INCOMPAT_META_UUID feature. ++ */ + #define XFS_SB_FEAT_INCOMPAT_SUPPORTED \ + (XFS_SB_FEAT_INCOMPAT_FTYPE | \ ++ XFS_SB_FEAT_INCOMPAT_SPINODES | \ + XFS_SB_FEAT_INCOMPAT_META_UUID) + + struct grub_xfs_sblock +-- +cgit v1.0-41-gc330 + + diff --git a/source/a/gzip/gzip.SlackBuild b/source/a/gzip/gzip.SlackBuild index 77d12698a..4afb707fa 100755 --- a/source/a/gzip/gzip.SlackBuild +++ b/source/a/gzip/gzip.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=gzip VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-2} -NUMJOBS=${NUMJOBS:--j6} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -70,6 +70,8 @@ rm -rf ${PKGNAM}-${VERSION} tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1 cd ${PKGNAM}-$VERSION +zcat $CWD/gzip.glibc228.diff.gz | patch -p1 --verbose || exit 1 + # Make sure ownerships and permissions are sane: chown -R root:root . find . \ diff --git a/source/a/gzip/gzip.glibc228.diff b/source/a/gzip/gzip.glibc228.diff new file mode 100644 index 000000000..6197f8910 --- /dev/null +++ b/source/a/gzip/gzip.glibc228.diff @@ -0,0 +1,126 @@ +--- ./lib/stdio-impl.h.orig 2018-01-03 18:38:53.000000000 -0600 ++++ ./lib/stdio-impl.h 2018-09-18 18:49:17.349062298 -0500 +@@ -18,6 +18,12 @@ + the same implementation of stdio extension API, except that some fields + have different naming conventions, or their access requires some casts. */ + ++/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this ++ problem by defining it ourselves. FIXME: Do not rely on glibc ++ internals. */ ++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN ++# define _IO_IN_BACKUP 0x100 ++#endif + + /* BSD stdio derived implementations. */ + +--- ./lib/freading.c.orig 2018-01-03 18:38:53.000000000 -0600 ++++ ./lib/freading.c 2018-09-18 18:49:17.347062298 -0500 +@@ -31,7 +31,7 @@ + /* Most systems provide FILE as a struct and the necessary bitmask in + <stdio.h>, because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + return ((fp->_flags & _IO_NO_WRITES) != 0 + || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 + && fp->_IO_read_base != NULL)); +--- ./lib/fflush.c.orig 2018-01-03 18:38:53.000000000 -0600 ++++ ./lib/fflush.c 2018-09-18 18:49:17.345062298 -0500 +@@ -33,7 +33,7 @@ + #undef fflush + + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + + /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ + static void +@@ -72,7 +72,7 @@ + + #endif + +-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) ++#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) + + # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ +@@ -148,7 +148,7 @@ + if (stream == NULL || ! freading (stream)) + return fflush (stream); + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + + clear_ungetc_buffer_preserving_position (stream); + +--- ./lib/fpurge.c.orig 2018-01-03 18:38:53.000000000 -0600 ++++ ./lib/fpurge.c 2018-09-18 18:49:17.346062298 -0500 +@@ -62,7 +62,7 @@ + /* Most systems provide FILE as a struct and the necessary bitmask in + <stdio.h>, because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_IO_read_end = fp->_IO_read_ptr; + fp->_IO_write_ptr = fp->_IO_write_base; + /* Avoid memory leak when there is an active ungetc buffer. */ +--- ./lib/fseeko.c.orig 2018-01-06 18:03:28.000000000 -0600 ++++ ./lib/fseeko.c 2018-09-18 18:49:17.348062298 -0500 +@@ -47,7 +47,7 @@ + #endif + + /* These tests are based on fpurge.c. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + if (fp->_IO_read_end == fp->_IO_read_ptr + && fp->_IO_write_ptr == fp->_IO_write_base + && fp->_IO_save_base == NULL) +@@ -123,7 +123,7 @@ + return -1; + } + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags &= ~_IO_EOF_SEEN; + fp->_offset = pos; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ +--- ./lib/fseterr.c.orig 2018-01-03 18:38:53.000000000 -0600 ++++ ./lib/fseterr.c 2018-09-18 18:49:17.349062298 -0500 +@@ -29,7 +29,7 @@ + /* Most systems provide FILE as a struct and the necessary bitmask in + <stdio.h>, because they need it for implementing getc() and putc() as + fast macros. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags |= _IO_ERR_SEEN; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ +--- ./ChangeLog.orig 2018-01-07 16:33:52.000000000 -0600 ++++ ./ChangeLog 2018-09-18 18:49:17.343062298 -0500 +@@ -1,3 +1,26 @@ ++2018-03-05 Paul Eggert <address@hidden> ++ ++ fflush: adjust to glibc 2.28 libio.h removal ++ Problem reported by Daniel P. Berrangé in: ++ https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html ++ * lib/fbufmode.c (fbufmode): ++ * lib/fflush.c (clear_ungetc_buffer_preserving_position) ++ (disable_seek_optimization, rpl_fflush): ++ * lib/fpending.c (__fpending): ++ * lib/fpurge.c (fpurge): ++ * lib/freadable.c (freadable): ++ * lib/freadahead.c (freadahead): ++ * lib/freading.c (freading): ++ * lib/freadptr.c (freadptr): ++ * lib/freadseek.c (freadptrinc): ++ * lib/fseeko.c (fseeko): ++ * lib/fseterr.c (fseterr): ++ * lib/fwritable.c (fwritable): ++ * lib/fwriting.c (fwriting): ++ Check _IO_EOF_SEEN instead of _IO_ftrylockfile. ++ * lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]: ++ Define if not already defined. ++ + 2018-01-07 Jim Meyering <meyering@fb.com> + + version 1.9 diff --git a/source/a/haveged/haveged.SlackBuild b/source/a/haveged/haveged.SlackBuild index 543893e5d..20e87a869 100755 --- a/source/a/haveged/haveged.SlackBuild +++ b/source/a/haveged/haveged.SlackBuild @@ -43,7 +43,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/a/hdparm/hdparm.SlackBuild b/source/a/hdparm/hdparm.SlackBuild index 755f2ced5..9579ff814 100755 --- a/source/a/hdparm/hdparm.SlackBuild +++ b/source/a/hdparm/hdparm.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:--j7} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-hdparm diff --git a/source/a/hostname/hostname.SlackBuild b/source/a/hostname/hostname.SlackBuild index 2c69718a5..898827639 100755 --- a/source/a/hostname/hostname.SlackBuild +++ b/source/a/hostname/hostname.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" diff --git a/source/a/isapnptools/isapnptools.SlackBuild b/source/a/isapnptools/isapnptools.SlackBuild index 90db30eff..e2fffda17 100755 --- a/source/a/isapnptools/isapnptools.SlackBuild +++ b/source/a/isapnptools/isapnptools.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=isapnptools VERSION=${VERSION:-1.27} BUILD=${BUILD:-2} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/jfsutils/jfsutils.SlackBuild b/source/a/jfsutils/jfsutils.SlackBuild index 1c9496d8a..1e3937ac1 100755 --- a/source/a/jfsutils/jfsutils.SlackBuild +++ b/source/a/jfsutils/jfsutils.SlackBuild @@ -70,6 +70,8 @@ find . \ # Fix build with recent glibc: sed "s@<unistd.h>@&\n#include <sys/types.h>@g" -i fscklog/extract.c +zcat $CWD/jfsutils.glibc228.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/jfsutils.inttypes.h.diff.gz | patch -p1 --verbose || exit 1 CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/a/jfsutils/jfsutils.glibc228.diff b/source/a/jfsutils/jfsutils.glibc228.diff new file mode 100644 index 000000000..2d930eddb --- /dev/null +++ b/source/a/jfsutils/jfsutils.glibc228.diff @@ -0,0 +1,10 @@ +--- ./libfs/devices.c.orig 2009-03-23 10:37:05.000000000 -0500 ++++ ./libfs/devices.c 2018-09-18 18:51:00.699063404 -0500 +@@ -40,6 +40,7 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <sys/ioctl.h> ++#include <sys/sysmacros.h> + #if defined(__DragonFly__) + #include <machine/param.h> + #include <sys/diskslice.h> diff --git a/source/a/jfsutils/jfsutils.inttypes.h.diff b/source/a/jfsutils/jfsutils.inttypes.h.diff new file mode 100644 index 000000000..51be7e33a --- /dev/null +++ b/source/a/jfsutils/jfsutils.inttypes.h.diff @@ -0,0 +1,11 @@ +--- ./libfs/devices.h.orig 2005-11-22 14:43:55.000000000 -0600 ++++ ./libfs/devices.h 2018-09-19 01:55:37.960336102 -0500 +@@ -40,6 +40,8 @@ + #define ERROR_INVALID_PARAMETER 87 + #define ERROR_DISK_FULL 112 + ++#include <inttypes.h> ++ + struct stat; + + int ujfs_get_dev_size(FILE *, int64_t * size); diff --git a/source/a/kbd/kbd.SlackBuild b/source/a/kbd/kbd.SlackBuild index 99d890635..8e8927626 100755 --- a/source/a/kbd/kbd.SlackBuild +++ b/source/a/kbd/kbd.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:--j6} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-kbd diff --git a/source/a/lbzip2/lbzip2.SlackBuild b/source/a/lbzip2/lbzip2.SlackBuild index 9dcf736fb..0c3318912 100755 --- a/source/a/lbzip2/lbzip2.SlackBuild +++ b/source/a/lbzip2/lbzip2.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" @@ -81,6 +81,8 @@ rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 +zcat $CWD/lbzip2.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/a/lbzip2/lbzip2.glibc228.diff b/source/a/lbzip2/lbzip2.glibc228.diff new file mode 100644 index 000000000..fc80e687c --- /dev/null +++ b/source/a/lbzip2/lbzip2.glibc228.diff @@ -0,0 +1,11 @@ +--- ./lib/fseterr.c.orig 2014-03-09 09:46:03.000000000 -0500 ++++ ./lib/fseterr.c 2018-09-18 18:51:50.403063936 -0500 +@@ -29,7 +29,7 @@ + /* Most systems provide FILE as a struct and the necessary bitmask in + <stdio.h>, because they need it for implementing getc() and putc() as + fast macros. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags |= _IO_ERR_SEEN; + #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ + fp_->_flags |= __SERR; diff --git a/source/a/less/less.SlackBuild b/source/a/less/less.SlackBuild index 042ec0bd0..50176a387 100755 --- a/source/a/less/less.SlackBuild +++ b/source/a/less/less.SlackBuild @@ -44,7 +44,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" diff --git a/source/a/libcgroup/libcgroup.SlackBuild b/source/a/libcgroup/libcgroup.SlackBuild index 761029cd3..246a7085a 100755 --- a/source/a/libcgroup/libcgroup.SlackBuild +++ b/source/a/libcgroup/libcgroup.SlackBuild @@ -44,7 +44,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" diff --git a/source/a/libgudev/libgudev.SlackBuild b/source/a/libgudev/libgudev.SlackBuild index 8d9f0e581..6dd427ff1 100755 --- a/source/a/libgudev/libgudev.SlackBuild +++ b/source/a/libgudev/libgudev.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=libgudev VERSION=${VERSION:-$(echo $PKGNAM-*.tar.* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} BUILD=${BUILD:-2} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/logrotate/logrotate.SlackBuild b/source/a/logrotate/logrotate.SlackBuild index 882602413..e948d0ad6 100755 --- a/source/a/logrotate/logrotate.SlackBuild +++ b/source/a/logrotate/logrotate.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=logrotate VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-2} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/lrzip/lrzip.SlackBuild b/source/a/lrzip/lrzip.SlackBuild index e580325a8..df56276d7 100755 --- a/source/a/lrzip/lrzip.SlackBuild +++ b/source/a/lrzip/lrzip.SlackBuild @@ -44,7 +44,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" diff --git a/source/a/lvm2/lvm2.SlackBuild b/source/a/lvm2/lvm2.SlackBuild index 05de03577..2a94a0d06 100755 --- a/source/a/lvm2/lvm2.SlackBuild +++ b/source/a/lvm2/lvm2.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=lvm2 VERSION=$(echo LVM2.*.tar.?z | cut -f 2- -d . | rev | cut -f 3- -d . | cut -f 1 -d - | rev) BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/lzip/lzip.SlackBuild b/source/a/lzip/lzip.SlackBuild index cd65e4bcf..ce1e0e118 100755 --- a/source/a/lzip/lzip.SlackBuild +++ b/source/a/lzip/lzip.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" = "i386" ]; then SLKCFLAGS="-O2 -march=i386 -mcpu=i686" diff --git a/source/a/lzlib/lzlib.SlackBuild b/source/a/lzlib/lzlib.SlackBuild index a2669946e..70d9cd36d 100755 --- a/source/a/lzlib/lzlib.SlackBuild +++ b/source/a/lzlib/lzlib.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" = "i386" ]; then SLKCFLAGS="-O2 -march=i386 -mcpu=i686" diff --git a/source/a/mcelog/mcelog.SlackBuild b/source/a/mcelog/mcelog.SlackBuild index c0ee57fe7..bef13e5c6 100755 --- a/source/a/mcelog/mcelog.SlackBuild +++ b/source/a/mcelog/mcelog.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/a/mdadm/mdadm.SlackBuild b/source/a/mdadm/mdadm.SlackBuild index 84fb053ad..3106e2238 100755 --- a/source/a/mdadm/mdadm.SlackBuild +++ b/source/a/mdadm/mdadm.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-mdadm diff --git a/source/a/minicom/minicom.SlackBuild b/source/a/minicom/minicom.SlackBuild index 81ad13249..20511e5e6 100755 --- a/source/a/minicom/minicom.SlackBuild +++ b/source/a/minicom/minicom.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=minicom VERSION=2.7.1 BUILD=${BUILD:-2} -NUMJOBS=${NUMJOBS:--j6} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/mkinitrd/mkinitrd.SlackBuild b/source/a/mkinitrd/mkinitrd.SlackBuild index 19a7f113d..7538dbd18 100755 --- a/source/a/mkinitrd/mkinitrd.SlackBuild +++ b/source/a/mkinitrd/mkinitrd.SlackBuild @@ -45,7 +45,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:--j7} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-mkinitrd diff --git a/source/a/mlocate/mlocate.SlackBuild b/source/a/mlocate/mlocate.SlackBuild index 1b2c780f8..fd21be9dc 100755 --- a/source/a/mlocate/mlocate.SlackBuild +++ b/source/a/mlocate/mlocate.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" diff --git a/source/a/ntfs-3g/ntfs-3g.SlackBuild b/source/a/ntfs-3g/ntfs-3g.SlackBuild index 1ead47e98..c5ecd0880 100755 --- a/source/a/ntfs-3g/ntfs-3g.SlackBuild +++ b/source/a/ntfs-3g/ntfs-3g.SlackBuild @@ -33,7 +33,7 @@ SRCNAM=ntfs-3g_ntfsprogs VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-2} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/pciutils/pciutils.SlackBuild b/source/a/pciutils/pciutils.SlackBuild index f60074503..b99aaac20 100755 --- a/source/a/pciutils/pciutils.SlackBuild +++ b/source/a/pciutils/pciutils.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=pciutils VERSION=${VERSION:-$(echo pciutils-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:--j7} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/pcmciautils/pcmciautils.SlackBuild b/source/a/pcmciautils/pcmciautils.SlackBuild index c44303dc1..c14091248 100755 --- a/source/a/pcmciautils/pcmciautils.SlackBuild +++ b/source/a/pcmciautils/pcmciautils.SlackBuild @@ -47,7 +47,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then fi # parallel build will cause an error building ccdv: -NUMJOBS=${NUMJOBS:-" -j1 "} +NUMJOBS=" -j1 " TMP=${TMP:-/tmp} PKG=$TMP/package-pcmciautils diff --git a/source/a/plzip/plzip.SlackBuild b/source/a/plzip/plzip.SlackBuild index 26d9f2023..869618a9a 100755 --- a/source/a/plzip/plzip.SlackBuild +++ b/source/a/plzip/plzip.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" = "i386" ]; then SLKCFLAGS="-O2 -march=i386 -mcpu=i686" diff --git a/source/a/procps-ng/procps-ng.SlackBuild b/source/a/procps-ng/procps-ng.SlackBuild index 456d38e35..4c4421f65 100755 --- a/source/a/procps-ng/procps-ng.SlackBuild +++ b/source/a/procps-ng/procps-ng.SlackBuild @@ -45,7 +45,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/a/quota/quota.SlackBuild b/source/a/quota/quota.SlackBuild index dd884c1ef..6c47e141b 100755 --- a/source/a/quota/quota.SlackBuild +++ b/source/a/quota/quota.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" = "i386" ]; then SLKCFLAGS="-O2 -march=i386 -mcpu=i686" diff --git a/source/a/reiserfsprogs/reiserfsprogs.SlackBuild b/source/a/reiserfsprogs/reiserfsprogs.SlackBuild index 1b88550a2..d5e2a93f0 100755 --- a/source/a/reiserfsprogs/reiserfsprogs.SlackBuild +++ b/source/a/reiserfsprogs/reiserfsprogs.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-reiserfsprogs @@ -67,6 +67,9 @@ cd $TMP rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 cd $PKGNAM-$VERSION || exit 1 + +zcat $CWD/reiserfsprogs.glibc228.diff.gz | patch -p1 --backup --suffix=.orig || 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/a/reiserfsprogs/reiserfsprogs.glibc228.diff b/source/a/reiserfsprogs/reiserfsprogs.glibc228.diff new file mode 100644 index 000000000..2c6119311 --- /dev/null +++ b/source/a/reiserfsprogs/reiserfsprogs.glibc228.diff @@ -0,0 +1,24 @@ +--- ./include/misc.h.orig 2017-07-24 20:34:11.000000000 -0500 ++++ ./include/misc.h 2018-09-18 19:00:40.783069613 -0500 +@@ -73,7 +73,7 @@ + int get_dma_info(dma_info_t *dma_info); + void clean_after_dma_check(int fd, dma_info_t *dma_info); + +-int valid_offset(int fd, loff_t offset); ++int valid_offset(int fd, off_t offset); + unsigned long count_blocks(const char *filename, int blocksize); + + void print_how_far(FILE * fp, unsigned long *passed, unsigned long total, +--- ./include/reiserfs_lib.h.orig 2016-06-07 09:22:56.000000000 -0500 ++++ ./include/reiserfs_lib.h 2018-09-18 19:00:40.786069613 -0500 +@@ -297,8 +297,8 @@ + char *key_of_what(const struct reiserfs_key *key); + int type_unknown(const struct reiserfs_key *key); + void set_type(int format, struct reiserfs_key *key, int type); +-void set_offset(int format, struct reiserfs_key *key, loff_t offset); +-void set_type_and_offset(int format, struct reiserfs_key *key, loff_t offset, ++void set_offset(int format, struct reiserfs_key *key, off_t offset); ++void set_type_and_offset(int format, struct reiserfs_key *key, off_t offset, + int type); + + typedef int (*check_unfm_func_t) (reiserfs_filsys_t , __u32); diff --git a/source/a/sdparm/sdparm.SlackBuild b/source/a/sdparm/sdparm.SlackBuild index b75b54070..54aaacaa6 100755 --- a/source/a/sdparm/sdparm.SlackBuild +++ b/source/a/sdparm/sdparm.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=sdparm VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-2} -NUMJOBS=${NUMJOBS:-"-j6"} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/sed/sed.SlackBuild b/source/a/sed/sed.SlackBuild index 10c3b9391..6757ead79 100755 --- a/source/a/sed/sed.SlackBuild +++ b/source/a/sed/sed.SlackBuild @@ -47,6 +47,8 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" diff --git a/source/a/shadow/shadow.SlackBuild b/source/a/shadow/shadow.SlackBuild index d088c41d6..d6ee4c9e0 100755 --- a/source/a/shadow/shadow.SlackBuild +++ b/source/a/shadow/shadow.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:--j6} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-shadow diff --git a/source/a/sharutils/sharutils.SlackBuild b/source/a/sharutils/sharutils.SlackBuild index 7c9d938d3..535fa714c 100755 --- a/source/a/sharutils/sharutils.SlackBuild +++ b/source/a/sharutils/sharutils.SlackBuild @@ -68,6 +68,9 @@ cd $TMP rm -rf sharutils-$VERSION tar xvf $CWD/sharutils-$VERSION.tar.?z || exit 1 cd sharutils-$VERSION || exit 1 + +zcat $CWD/sharutils.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/a/sharutils/sharutils.glibc228.diff b/source/a/sharutils/sharutils.glibc228.diff new file mode 100644 index 000000000..1f3a25d97 --- /dev/null +++ b/source/a/sharutils/sharutils.glibc228.diff @@ -0,0 +1,20 @@ +--- ./lib/fseeko.c.orig 2015-05-30 10:34:54.000000000 -0500 ++++ ./lib/fseeko.c 2018-09-18 19:01:59.959070461 -0500 +@@ -47,7 +47,7 @@ + #endif + + /* These tests are based on fpurge.c. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + if (fp->_IO_read_end == fp->_IO_read_ptr + && fp->_IO_write_ptr == fp->_IO_write_base + && fp->_IO_save_base == NULL) +@@ -123,7 +123,7 @@ + return -1; + } + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags &= ~_IO_EOF_SEEN; + fp->_offset = pos; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ diff --git a/source/a/sysklogd/sysklogd.SlackBuild b/source/a/sysklogd/sysklogd.SlackBuild index 2fb38ac07..192e6944c 100755 --- a/source/a/sysklogd/sysklogd.SlackBuild +++ b/source/a/sysklogd/sysklogd.SlackBuild @@ -42,7 +42,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:--j6} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-sysklogd diff --git a/source/a/syslinux/syslinux.SlackBuild b/source/a/syslinux/syslinux.SlackBuild index ff3b654d8..ffc20dbb3 100755 --- a/source/a/syslinux/syslinux.SlackBuild +++ b/source/a/syslinux/syslinux.SlackBuild @@ -54,6 +54,8 @@ rm -rf ${PKGNAM}-${VERSION} tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1 cd ${PKGNAM}-$VERSION +zcat $CWD/syslinux.glibc228.diff.gz | patch -p1 --verbose || exit 1 + # Make sure ownerships and permissions are sane: chown -R root:root . find . \ diff --git a/source/a/syslinux/syslinux.glibc228.diff b/source/a/syslinux/syslinux.glibc228.diff new file mode 100644 index 000000000..9e1a65b74 --- /dev/null +++ b/source/a/syslinux/syslinux.glibc228.diff @@ -0,0 +1,10 @@ +--- ./extlinux/main.c.orig 2013-07-25 04:28:59.000000000 -0500 ++++ ./extlinux/main.c 2018-09-18 19:04:58.814072375 -0500 +@@ -36,6 +36,7 @@ + #include <getopt.h> + #include <sysexits.h> + #include <sys/ioctl.h> ++#include <sys/sysmacros.h> + #include <sys/stat.h> + #include <sys/types.h> + #include <sys/mount.h> diff --git a/source/a/tar/tar.SlackBuild b/source/a/tar/tar.SlackBuild index 6c97c24e6..bbe48d331 100755 --- a/source/a/tar/tar.SlackBuild +++ b/source/a/tar/tar.SlackBuild @@ -28,7 +28,7 @@ PKGNAM=tar VERSION=1.30 BUILD=${BUILD:-3} -NUMJOBS=${NUMJOBS:--j7} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine architecture for build & packaging: if [ -z "$ARCH" ]; then diff --git a/source/a/tcsh/tcsh.SlackBuild b/source/a/tcsh/tcsh.SlackBuild index db6a35c74..d4937da62 100755 --- a/source/a/tcsh/tcsh.SlackBuild +++ b/source/a/tcsh/tcsh.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} diff --git a/source/a/time/time.SlackBuild b/source/a/time/time.SlackBuild index ca886288e..1a200f58b 100755 --- a/source/a/time/time.SlackBuild +++ b/source/a/time/time.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" diff --git a/source/a/tree/tree.SlackBuild b/source/a/tree/tree.SlackBuild index bd407c3ee..4dd419c0c 100755 --- a/source/a/tree/tree.SlackBuild +++ b/source/a/tree/tree.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=tree VERSION=1.7.0 BUILD=${BUILD:-2} -NUMJOBS=${NUMJOBS:--j6} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/udisks/udisks.SlackBuild b/source/a/udisks/udisks.SlackBuild index 52bb13fb4..af3e6ecdc 100755 --- a/source/a/udisks/udisks.SlackBuild +++ b/source/a/udisks/udisks.SlackBuild @@ -30,7 +30,7 @@ PKGNAM=udisks VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-4} -NUMJOBS=${NUMJOBS:--j7} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) @@ -91,6 +91,7 @@ find . \ -exec chmod 644 {} \; zcat $CWD/udisks.no.pci-db.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/udisks.glibc228.diff.gz | patch -p1 --verbose || exit 1 CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/source/a/udisks/udisks.glibc228.diff b/source/a/udisks/udisks.glibc228.diff new file mode 100644 index 000000000..43f6bf29a --- /dev/null +++ b/source/a/udisks/udisks.glibc228.diff @@ -0,0 +1,52 @@ +--- ./src/device.c.orig 2014-03-10 03:57:48.000000000 -0500 ++++ ./src/device.c 2018-09-18 19:06:22.494073271 -0500 +@@ -33,6 +33,7 @@ + #include <sys/stat.h> + #include <sys/time.h> + #include <sys/resource.h> ++#include <sys/sysmacros.h> + #include <fcntl.h> + #include <pwd.h> + #include <grp.h> +--- ./src/daemon.c.orig 2014-03-10 03:57:48.000000000 -0500 ++++ ./src/daemon.c 2018-09-18 19:06:22.490073271 -0500 +@@ -45,6 +45,7 @@ + #include <sys/socket.h> + #include <sys/un.h> + #include <sys/utsname.h> ++#include <sys/sysmacros.h> + #include <net/if_arp.h> + #include <fcntl.h> + #include <signal.h> +--- ./src/mount-monitor.c.orig 2014-03-10 03:58:42.000000000 -0500 ++++ ./src/mount-monitor.c 2018-09-18 19:06:22.495073271 -0500 +@@ -28,7 +28,9 @@ + #include <errno.h> + #include <string.h> + #include <sys/types.h> ++#include <sys/sysmacros.h> + #include <sys/stat.h> ++ + #include <mntent.h> + + #include <glib.h> +--- ./tools/umount-udisks.c.orig 2014-03-10 03:57:48.000000000 -0500 ++++ ./tools/umount-udisks.c 2018-09-18 19:06:22.497073271 -0500 +@@ -30,6 +30,7 @@ + #include <string.h> + #include <sys/types.h> + #include <sys/stat.h> ++#include <sys/sysmacros.h> + #include <fcntl.h> + #include <pwd.h> + #include <grp.h> +--- ./tools/udisks.c.orig 2014-03-10 03:57:48.000000000 -0500 ++++ ./tools/udisks.c 2018-09-18 19:06:22.496073271 -0500 +@@ -31,6 +31,7 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <sys/wait.h> ++#include <sys/sysmacros.h> + #include <fcntl.h> + #include <pwd.h> + #include <grp.h> diff --git a/source/a/udisks2/udisks2.SlackBuild b/source/a/udisks2/udisks2.SlackBuild index 32fe6903a..999cd1ee3 100755 --- a/source/a/udisks2/udisks2.SlackBuild +++ b/source/a/udisks2/udisks2.SlackBuild @@ -31,7 +31,7 @@ SRCNAM=udisks VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-2} -NUMJOBS=${NUMJOBS:--j7} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) diff --git a/source/a/upower/upower.SlackBuild b/source/a/upower/upower.SlackBuild index bc4caa11c..6276e9c72 100755 --- a/source/a/upower/upower.SlackBuild +++ b/source/a/upower/upower.SlackBuild @@ -30,7 +30,7 @@ PKGNAM=upower VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} BUILD=${BUILD:-4} -NUMJOBS=${NUMJOBS:--j7} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) diff --git a/source/a/usbutils/usbutils.SlackBuild b/source/a/usbutils/usbutils.SlackBuild index c45e6cb57..88497af22 100755 --- a/source/a/usbutils/usbutils.SlackBuild +++ b/source/a/usbutils/usbutils.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=usbutils VERSION=${VERSION:-$(echo usbutils-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:--j7} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/util-linux/util-linux.SlackBuild b/source/a/util-linux/util-linux.SlackBuild index 2b4e4dcd0..95bbb1ff9 100755 --- a/source/a/util-linux/util-linux.SlackBuild +++ b/source/a/util-linux/util-linux.SlackBuild @@ -32,7 +32,7 @@ ADJTIMEXVERS=1.29 SETSERIALVERS=2.17 ZIPTOOLVERS=1.4.0 -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/xfsprogs/xfsprogs.SlackBuild b/source/a/xfsprogs/xfsprogs.SlackBuild index a854288b3..73558b5ee 100755 --- a/source/a/xfsprogs/xfsprogs.SlackBuild +++ b/source/a/xfsprogs/xfsprogs.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=xfsprogs VERSION=${VERSION:-$(echo xfsprogs-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/xz/xz.SlackBuild b/source/a/xz/xz.SlackBuild index 08b03ea5d..16dc90bdb 100755 --- a/source/a/xz/xz.SlackBuild +++ b/source/a/xz/xz.SlackBuild @@ -71,7 +71,7 @@ case "$ARCH" in ;; esac -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/ap/a2ps/a2ps.SlackBuild b/source/ap/a2ps/a2ps.SlackBuild index e9dc3d578..c0e280cad 100755 --- a/source/ap/a2ps/a2ps.SlackBuild +++ b/source/ap/a2ps/a2ps.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} diff --git a/source/ap/alsa-utils/alsa-utils.SlackBuild b/source/ap/alsa-utils/alsa-utils.SlackBuild index 13c75e564..52cb25051 100755 --- a/source/ap/alsa-utils/alsa-utils.SlackBuild +++ b/source/ap/alsa-utils/alsa-utils.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=alsa-utils VERSION=${VERSION:-$(echo alsa-utils-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-2} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-alsa-utils diff --git a/source/ap/bc/bc.SlackBuild b/source/ap/bc/bc.SlackBuild index ac8bd4fe8..5f67ba008 100755 --- a/source/ap/bc/bc.SlackBuild +++ b/source/ap/bc/bc.SlackBuild @@ -43,7 +43,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} diff --git a/source/ap/cdparanoia/cdparanoia.SlackBuild b/source/ap/cdparanoia/cdparanoia.SlackBuild index 7d54183d8..62f744a88 100755 --- a/source/ap/cdparanoia/cdparanoia.SlackBuild +++ b/source/ap/cdparanoia/cdparanoia.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-cdparanoia diff --git a/source/ap/cdrdao/cdrdao.SlackBuild b/source/ap/cdrdao/cdrdao.SlackBuild index 21fa89fd9..ee83fc3b9 100755 --- a/source/ap/cdrdao/cdrdao.SlackBuild +++ b/source/ap/cdrdao/cdrdao.SlackBuild @@ -44,7 +44,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" diff --git a/source/ap/cdrtools/cdrtools.SlackBuild b/source/ap/cdrtools/cdrtools.SlackBuild index 48cc58fe7..3cd44084d 100755 --- a/source/ap/cdrtools/cdrtools.SlackBuild +++ b/source/ap/cdrtools/cdrtools.SlackBuild @@ -27,7 +27,7 @@ VERSION=${VERSION:-$(echo cdrtools-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- - BUILD=${BUILD:-4} ZISOFSTOOLS=1.0.8 -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/ap/cgmanager/cgmanager.SlackBuild b/source/ap/cgmanager/cgmanager.SlackBuild index 397138809..0d2781313 100755 --- a/source/ap/cgmanager/cgmanager.SlackBuild +++ b/source/ap/cgmanager/cgmanager.SlackBuild @@ -46,7 +46,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" diff --git a/source/ap/cups-filters/cups-filters.SlackBuild b/source/ap/cups-filters/cups-filters.SlackBuild index 4ef6aec9e..be8195666 100755 --- a/source/ap/cups-filters/cups-filters.SlackBuild +++ b/source/ap/cups-filters/cups-filters.SlackBuild @@ -44,7 +44,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" diff --git a/source/ap/cups/cups.SlackBuild b/source/ap/cups/cups.SlackBuild index 44cd7c674..1cc92b54b 100755 --- a/source/ap/cups/cups.SlackBuild +++ b/source/ap/cups/cups.SlackBuild @@ -66,7 +66,7 @@ else LIBDIRSUFFIX="" fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-cups diff --git a/source/ap/dash/dash.SlackBuild b/source/ap/dash/dash.SlackBuild index a46edca58..b2ca27b2a 100755 --- a/source/ap/dash/dash.SlackBuild +++ b/source/ap/dash/dash.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" diff --git a/source/ap/dc3dd/dc3dd.SlackBuild b/source/ap/dc3dd/dc3dd.SlackBuild index ab3eaacb9..6dbd0e7cb 100755 --- a/source/ap/dc3dd/dc3dd.SlackBuild +++ b/source/ap/dc3dd/dc3dd.SlackBuild @@ -78,6 +78,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +zcat $CWD/dc3dd.glibc228.diff.gz | patch -p1 --verbose || exit 1 + chmod +x ./configure CFLAGS="$SLKCFLAGS" \ diff --git a/source/ap/dc3dd/dc3dd.glibc228.diff b/source/ap/dc3dd/dc3dd.glibc228.diff new file mode 100644 index 000000000..cd5f2bda9 --- /dev/null +++ b/source/ap/dc3dd/dc3dd.glibc228.diff @@ -0,0 +1,57 @@ +--- ./lib/stdio-impl.h.orig 2012-11-06 05:42:58.000000000 -0600 ++++ ./lib/stdio-impl.h 2018-09-18 18:43:39.324058680 -0500 +@@ -92,3 +92,10 @@ + # endif + + #endif ++ ++/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this ++ problem by defining it ourselves. FIXME: Do not rely on glibc ++ internals. */ ++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN ++# define _IO_IN_BACKUP 0x100 ++#endif +--- ./lib/freadahead.c.orig 2012-11-06 05:42:58.000000000 -0600 ++++ ./lib/freadahead.c 2018-09-18 18:43:39.319058680 -0500 +@@ -24,7 +24,7 @@ + size_t + freadahead (FILE *fp) + { +-#if defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ + if (fp->_IO_write_ptr > fp->_IO_write_base) + return 0; + return (fp->_IO_read_end - fp->_IO_read_ptr) +--- ./lib/freadseek.c.orig 2012-11-06 05:42:58.000000000 -0600 ++++ ./lib/freadseek.c 2018-09-18 18:43:39.322058680 -0500 +@@ -34,7 +34,7 @@ + freadptrinc (FILE *fp, size_t increment) + { + /* Keep this code in sync with freadptr! */ +-#if defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ + fp->_IO_read_ptr += increment; + #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */ + fp_->_p += increment; +--- ./lib/fseterr.c.orig 2012-11-06 05:42:58.000000000 -0600 ++++ ./lib/fseterr.c 2018-09-18 18:43:39.323058680 -0500 +@@ -29,7 +29,7 @@ + /* Most systems provide FILE as a struct and the necessary bitmask in + <stdio.h>, because they need it for implementing getc() and putc() as + fast macros. */ +-#if defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ + fp->_flags |= _IO_ERR_SEEN; + #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */ + fp_->_flags |= __SERR; +--- ./lib/freadptr.c.orig 2012-11-06 05:42:58.000000000 -0600 ++++ ./lib/freadptr.c 2018-09-18 18:43:39.321058680 -0500 +@@ -29,7 +29,7 @@ + size_t size; + + /* Keep this code in sync with freadahead! */ +-#if defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ + if (fp->_IO_write_ptr > fp->_IO_write_base) + return NULL; + size = fp->_IO_read_end - fp->_IO_read_ptr; diff --git a/source/ap/ddrescue/ddrescue.SlackBuild b/source/ap/ddrescue/ddrescue.SlackBuild index be2dd6e9d..7bd93b681 100755 --- a/source/ap/ddrescue/ddrescue.SlackBuild +++ b/source/ap/ddrescue/ddrescue.SlackBuild @@ -44,7 +44,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" diff --git a/source/ap/diffstat/diffstat.SlackBuild b/source/ap/diffstat/diffstat.SlackBuild index 7f0314206..3381075d0 100755 --- a/source/ap/diffstat/diffstat.SlackBuild +++ b/source/ap/diffstat/diffstat.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} diff --git a/source/ap/dmidecode/dmidecode.SlackBuild b/source/ap/dmidecode/dmidecode.SlackBuild index 329d6dc3b..3b3528b78 100755 --- a/source/ap/dmidecode/dmidecode.SlackBuild +++ b/source/ap/dmidecode/dmidecode.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} diff --git a/source/ap/dvd+rw-tools/dvd+rw-tools.SlackBuild b/source/ap/dvd+rw-tools/dvd+rw-tools.SlackBuild index 71f74253f..698e0671c 100755 --- a/source/ap/dvd+rw-tools/dvd+rw-tools.SlackBuild +++ b/source/ap/dvd+rw-tools/dvd+rw-tools.SlackBuild @@ -46,7 +46,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-dvd+rw-tools @@ -66,6 +66,7 @@ find . \ -exec chmod 644 {} \; zcat $CWD/dvd+rw-tools.limits.h.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/dvd+rw-tools.glibc228.diff.gz | patch -p1 --verbose || exit 1 make $NUMJOBS || make || exit 1 diff --git a/source/ap/dvd+rw-tools/dvd+rw-tools.glibc228.diff b/source/ap/dvd+rw-tools/dvd+rw-tools.glibc228.diff new file mode 100644 index 000000000..d9d5d325f --- /dev/null +++ b/source/ap/dvd+rw-tools/dvd+rw-tools.glibc228.diff @@ -0,0 +1,10 @@ +--- ./growisofs.c.orig 2008-03-04 03:15:03.000000000 -0600 ++++ ./growisofs.c 2018-09-18 18:45:29.640059861 -0500 +@@ -441,6 +441,7 @@ + #include <fcntl.h> + #include <sys/types.h> + #include <sys/stat.h> ++#include <sys/sysmacros.h> + #include <assert.h> + #include "mp.h" + diff --git a/source/ap/enscript/enscript.SlackBuild b/source/ap/enscript/enscript.SlackBuild index bb2f250d8..9ff6ee2b0 100755 --- a/source/ap/enscript/enscript.SlackBuild +++ b/source/ap/enscript/enscript.SlackBuild @@ -44,7 +44,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" diff --git a/source/ap/flac/flac.SlackBuild b/source/ap/flac/flac.SlackBuild index 0d74bf313..73199f4a4 100755 --- a/source/ap/flac/flac.SlackBuild +++ b/source/ap/flac/flac.SlackBuild @@ -44,7 +44,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" diff --git a/source/ap/ghostscript/ghostscript.SlackBuild b/source/ap/ghostscript/ghostscript.SlackBuild index 0e113a3a0..cad33b149 100755 --- a/source/ap/ghostscript/ghostscript.SlackBuild +++ b/source/ap/ghostscript/ghostscript.SlackBuild @@ -47,7 +47,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} diff --git a/source/ap/gphoto2/gphoto2.SlackBuild b/source/ap/gphoto2/gphoto2.SlackBuild index 73d7a669e..1ef238b30 100755 --- a/source/ap/gphoto2/gphoto2.SlackBuild +++ b/source/ap/gphoto2/gphoto2.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=gphoto2 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:--j6} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/ap/groff/groff.SlackBuild b/source/ap/groff/groff.SlackBuild index fcaaa1b3f..c7cc67126 100755 --- a/source/ap/groff/groff.SlackBuild +++ b/source/ap/groff/groff.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:--j7} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-groff diff --git a/source/ap/gutenprint/gutenprint.SlackBuild b/source/ap/gutenprint/gutenprint.SlackBuild index 2478b7863..4f7eba070 100755 --- a/source/ap/gutenprint/gutenprint.SlackBuild +++ b/source/ap/gutenprint/gutenprint.SlackBuild @@ -44,7 +44,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" diff --git a/source/ap/hplip/hplip.SlackBuild b/source/ap/hplip/hplip.SlackBuild index 8e18782aa..6796ba25a 100755 --- a/source/ap/hplip/hplip.SlackBuild +++ b/source/ap/hplip/hplip.SlackBuild @@ -29,7 +29,7 @@ PKGNAM=hplip VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-4} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/ap/htop/htop.SlackBuild b/source/ap/htop/htop.SlackBuild index 6f3bd10da..0aaee7cae 100755 --- a/source/ap/htop/htop.SlackBuild +++ b/source/ap/htop/htop.SlackBuild @@ -44,7 +44,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" diff --git a/source/ap/itstool/itstool.SlackBuild b/source/ap/itstool/itstool.SlackBuild index 650e31444..ac15798e1 100755 --- a/source/ap/itstool/itstool.SlackBuild +++ b/source/ap/itstool/itstool.SlackBuild @@ -45,7 +45,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/ap/jed/jed.SlackBuild b/source/ap/jed/jed.SlackBuild index 540310087..f18408a02 100755 --- a/source/ap/jed/jed.SlackBuild +++ b/source/ap/jed/jed.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" = "i386" ]; then SLKCFLAGS="-O2 -march=i386 -mcpu=i686" diff --git a/source/ap/joe/joe.SlackBuild b/source/ap/joe/joe.SlackBuild index 643f914c8..62ff3801f 100755 --- a/source/ap/joe/joe.SlackBuild +++ b/source/ap/joe/joe.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-joe diff --git a/source/ap/jove/jove.SlackBuild b/source/ap/jove/jove.SlackBuild index 2c560fe45..2a394a87c 100755 --- a/source/ap/jove/jove.SlackBuild +++ b/source/ap/jove/jove.SlackBuild @@ -44,7 +44,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" diff --git a/source/ap/lm_sensors/lm_sensors.SlackBuild b/source/ap/lm_sensors/lm_sensors.SlackBuild index 72abe9650..97ec3c1df 100755 --- a/source/ap/lm_sensors/lm_sensors.SlackBuild +++ b/source/ap/lm_sensors/lm_sensors.SlackBuild @@ -50,7 +50,7 @@ else LIBDIRSUFFIX="" fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} diff --git a/source/ap/lsscsi/lsscsi.SlackBuild b/source/ap/lsscsi/lsscsi.SlackBuild index b878a5170..d78dcd851 100755 --- a/source/ap/lsscsi/lsscsi.SlackBuild +++ b/source/ap/lsscsi/lsscsi.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} diff --git a/source/ap/lxc/lxc.SlackBuild b/source/ap/lxc/lxc.SlackBuild index 9829e3acd..5a2792e16 100755 --- a/source/ap/lxc/lxc.SlackBuild +++ b/source/ap/lxc/lxc.SlackBuild @@ -46,7 +46,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" diff --git a/source/ap/madplay/madplay.SlackBuild b/source/ap/madplay/madplay.SlackBuild index bba361896..255ff65e8 100755 --- a/source/ap/madplay/madplay.SlackBuild +++ b/source/ap/madplay/madplay.SlackBuild @@ -44,7 +44,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" diff --git a/source/ap/man-db/man-db.SlackBuild b/source/ap/man-db/man-db.SlackBuild index 080d97594..4d8d4bf1f 100755 --- a/source/ap/man-db/man-db.SlackBuild +++ b/source/ap/man-db/man-db.SlackBuild @@ -80,7 +80,7 @@ TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM OUTPUT=${OUTPUT:-/tmp} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" diff --git a/source/ap/mariadb/mariadb.SlackBuild b/source/ap/mariadb/mariadb.SlackBuild index 643adc883..482f66f18 100755 --- a/source/ap/mariadb/mariadb.SlackBuild +++ b/source/ap/mariadb/mariadb.SlackBuild @@ -65,7 +65,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} diff --git a/source/ap/mc/mc.SlackBuild b/source/ap/mc/mc.SlackBuild index bc5a535c1..ae15ffdf7 100755 --- a/source/ap/mc/mc.SlackBuild +++ b/source/ap/mc/mc.SlackBuild @@ -44,7 +44,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" diff --git a/source/ap/moc/moc.SlackBuild b/source/ap/moc/moc.SlackBuild index 3807d8d46..2fbf4320f 100755 --- a/source/ap/moc/moc.SlackBuild +++ b/source/ap/moc/moc.SlackBuild @@ -44,7 +44,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" diff --git a/source/ap/most/most.SlackBuild b/source/ap/most/most.SlackBuild index 063c00aa8..5a9614b37 100755 --- a/source/ap/most/most.SlackBuild +++ b/source/ap/most/most.SlackBuild @@ -44,7 +44,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" diff --git a/source/ap/mpg123/mpg123.SlackBuild b/source/ap/mpg123/mpg123.SlackBuild index 613386fa1..716de8262 100755 --- a/source/ap/mpg123/mpg123.SlackBuild +++ b/source/ap/mpg123/mpg123.SlackBuild @@ -25,7 +25,7 @@ PKGNAM=mpg123 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-2} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/ap/nano/nano.SlackBuild b/source/ap/nano/nano.SlackBuild index 3635bb7dc..56561f6db 100755 --- a/source/ap/nano/nano.SlackBuild +++ b/source/ap/nano/nano.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=nano VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/ap/normalize/normalize.SlackBuild b/source/ap/normalize/normalize.SlackBuild index 578adffcb..22030c120 100755 --- a/source/ap/normalize/normalize.SlackBuild +++ b/source/ap/normalize/normalize.SlackBuild @@ -44,7 +44,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 -mcpu=i686" diff --git a/source/ap/opus-tools/opus-tools.SlackBuild b/source/ap/opus-tools/opus-tools.SlackBuild index 6da292d5a..2df564907 100755 --- a/source/ap/opus-tools/opus-tools.SlackBuild +++ b/source/ap/opus-tools/opus-tools.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=opus-tools VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -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" diff --git a/source/ap/pamixer/pamixer.SlackBuild b/source/ap/pamixer/pamixer.SlackBuild index 80eac7fef..289257af4 100755 --- a/source/ap/pamixer/pamixer.SlackBuild +++ b/source/ap/pamixer/pamixer.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/ap/pm-utils/pm-utils.SlackBuild b/source/ap/pm-utils/pm-utils.SlackBuild index 3d38cbc49..43f6d6328 100755 --- a/source/ap/pm-utils/pm-utils.SlackBuild +++ b/source/ap/pm-utils/pm-utils.SlackBuild @@ -31,7 +31,7 @@ BUILD=${BUILD:-6} QUIRKS=20100619 # Version of the quirks database -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/ap/powertop/powertop.SlackBuild b/source/ap/powertop/powertop.SlackBuild index 19b69e8ca..999cb2f48 100755 --- a/source/ap/powertop/powertop.SlackBuild +++ b/source/ap/powertop/powertop.SlackBuild @@ -49,7 +49,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} diff --git a/source/ap/qpdf/qpdf.SlackBuild b/source/ap/qpdf/qpdf.SlackBuild index 9c4b08881..2d337ae20 100755 --- a/source/ap/qpdf/qpdf.SlackBuild +++ b/source/ap/qpdf/qpdf.SlackBuild @@ -46,7 +46,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/ap/rpm/rpm.SlackBuild b/source/ap/rpm/rpm.SlackBuild index 63103558a..e61b143f3 100755 --- a/source/ap/rpm/rpm.SlackBuild +++ b/source/ap/rpm/rpm.SlackBuild @@ -28,7 +28,7 @@ PKGNAM=rpm VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-2} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/ap/rzip/rzip.SlackBuild b/source/ap/rzip/rzip.SlackBuild index 4a438cdb3..db8d137ad 100755 --- a/source/ap/rzip/rzip.SlackBuild +++ b/source/ap/rzip/rzip.SlackBuild @@ -44,7 +44,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" elif [ "$ARCH" = "s390" ]; then diff --git a/source/ap/sc-im/sc-im.SlackBuild b/source/ap/sc-im/sc-im.SlackBuild index 38e7c6b2d..4cfe5d986 100755 --- a/source/ap/sc-im/sc-im.SlackBuild +++ b/source/ap/sc-im/sc-im.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" diff --git a/source/ap/screen/screen.SlackBuild b/source/ap/screen/screen.SlackBuild index 7ce6f2aaf..f5d568321 100755 --- a/source/ap/screen/screen.SlackBuild +++ b/source/ap/screen/screen.SlackBuild @@ -57,7 +57,7 @@ fi TMP=${TMP:-/tmp} PKG=$TMP/package-screen -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} rm -rf $PKG mkdir -p $TMP $PKG diff --git a/source/ap/seejpeg/seejpeg.SlackBuild b/source/ap/seejpeg/seejpeg.SlackBuild index c5bb84670..318b48dd7 100755 --- a/source/ap/seejpeg/seejpeg.SlackBuild +++ b/source/ap/seejpeg/seejpeg.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-seejpeg diff --git a/source/ap/sox/sox.SlackBuild b/source/ap/sox/sox.SlackBuild index 757f6d93c..5d29d7e22 100755 --- a/source/ap/sox/sox.SlackBuild +++ b/source/ap/sox/sox.SlackBuild @@ -36,7 +36,7 @@ if [ -z "$ARCH" ]; then esac fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" diff --git a/source/ap/sqlite/sqlite.SlackBuild b/source/ap/sqlite/sqlite.SlackBuild index e9c7530b4..59982b70d 100755 --- a/source/ap/sqlite/sqlite.SlackBuild +++ b/source/ap/sqlite/sqlite.SlackBuild @@ -45,7 +45,7 @@ if [ ! "$PATCHLEVEL" = "0" ]; then OLD_STYLE=${OLD_STYLE}.${PATCHLEVEL} fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then 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> diff --git a/source/ap/sudo/sudo.SlackBuild b/source/ap/sudo/sudo.SlackBuild index 13e418503..307fe11be 100755 --- a/source/ap/sudo/sudo.SlackBuild +++ b/source/ap/sudo/sudo.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-sudo diff --git a/source/ap/sysstat/sysstat.SlackBuild b/source/ap/sysstat/sysstat.SlackBuild index ddeeb4c13..99acb35b9 100755 --- a/source/ap/sysstat/sysstat.SlackBuild +++ b/source/ap/sysstat/sysstat.SlackBuild @@ -44,6 +44,8 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" diff --git a/source/ap/texinfo/texinfo.SlackBuild b/source/ap/texinfo/texinfo.SlackBuild index 79b6a5fcd..986f95ddf 100755 --- a/source/ap/texinfo/texinfo.SlackBuild +++ b/source/ap/texinfo/texinfo.SlackBuild @@ -44,7 +44,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" diff --git a/source/ap/tmux/tmux.SlackBuild b/source/ap/tmux/tmux.SlackBuild index ccd43d999..21b93ef23 100755 --- a/source/ap/tmux/tmux.SlackBuild +++ b/source/ap/tmux/tmux.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" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mcpu=i686" diff --git a/source/ap/usbmuxd/usbmuxd.SlackBuild b/source/ap/usbmuxd/usbmuxd.SlackBuild index 1af4fcdf9..0ed1046cd 100755 --- a/source/ap/usbmuxd/usbmuxd.SlackBuild +++ b/source/ap/usbmuxd/usbmuxd.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} diff --git a/source/ap/vim/vim-gvim.SlackBuild b/source/ap/vim/vim-gvim.SlackBuild index 0f8ff3846..f990bdfad 100755 --- a/source/ap/vim/vim-gvim.SlackBuild +++ b/source/ap/vim/vim-gvim.SlackBuild @@ -52,7 +52,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} PYVER=$(python -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d.) diff --git a/source/ap/vim/vim.SlackBuild b/source/ap/vim/vim.SlackBuild index 379ac42f8..f9a579015 100755 --- a/source/ap/vim/vim.SlackBuild +++ b/source/ap/vim/vim.SlackBuild @@ -60,7 +60,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} PYVER=$(python -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d.) diff --git a/source/ap/vorbis-tools/vorbis-tools.SlackBuild b/source/ap/vorbis-tools/vorbis-tools.SlackBuild index cdb544e1b..d0d3d8249 100755 --- a/source/ap/vorbis-tools/vorbis-tools.SlackBuild +++ b/source/ap/vorbis-tools/vorbis-tools.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-vorbis-tools diff --git a/source/ap/xfsdump/xfsdump.SlackBuild b/source/ap/xfsdump/xfsdump.SlackBuild index b222639d0..e633688a3 100755 --- a/source/ap/xfsdump/xfsdump.SlackBuild +++ b/source/ap/xfsdump/xfsdump.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=xfsdump VERSION=${VERSION:-$(echo xfsdump-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-2} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/ap/xorriso/xorriso.SlackBuild b/source/ap/xorriso/xorriso.SlackBuild index 9282a0ec2..5d45c40e6 100755 --- a/source/ap/xorriso/xorriso.SlackBuild +++ b/source/ap/xorriso/xorriso.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" diff --git a/source/ap/zsh/zsh.SlackBuild b/source/ap/zsh/zsh.SlackBuild index f5893b247..1f9e068c0 100755 --- a/source/ap/zsh/zsh.SlackBuild +++ b/source/ap/zsh/zsh.SlackBuild @@ -44,7 +44,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" |