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/l | |
| 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 'source/l')
287 files changed, 613 insertions, 556 deletions
diff --git a/source/l/ConsoleKit2/ConsoleKit2.SlackBuild b/source/l/ConsoleKit2/ConsoleKit2.SlackBuild index e61433e7b..76870a08f 100755 --- a/source/l/ConsoleKit2/ConsoleKit2.SlackBuild +++ b/source/l/ConsoleKit2/ConsoleKit2.SlackBuild @@ -30,7 +30,7 @@ PKGNAM=ConsoleKit2 VERSION=${VERSION:-1.0.0} BUILD=${BUILD:-4} -NUMJOBS=${NUMJOBS:--j6} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/l/GConf/GConf.SlackBuild b/source/l/GConf/GConf.SlackBuild index 50ee3ce0e..06d3b2f12 100755 --- a/source/l/GConf/GConf.SlackBuild +++ b/source/l/GConf/GConf.SlackBuild @@ -28,7 +28,7 @@ PKGNAM=GConf VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-4} -NUMJOBS=${NUMJOBS:--j6} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/LibRaw/LibRaw.SlackBuild b/source/l/LibRaw/LibRaw.SlackBuild index 1b8aa75a0..c4f59f639 100755 --- a/source/l/LibRaw/LibRaw.SlackBuild +++ b/source/l/LibRaw/LibRaw.SlackBuild @@ -28,7 +28,7 @@ VERSION=${VERSION:-0.18.12} DEMOSAIC=${DEMOSAIC:-0.18.8} 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/l/PyQt/PyQt.SlackBuild b/source/l/PyQt/PyQt.SlackBuild index 7ca9a037e..ca0ff1744 100755 --- a/source/l/PyQt/PyQt.SlackBuild +++ b/source/l/PyQt/PyQt.SlackBuild @@ -52,7 +52,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/l/QScintilla/QScintilla.SlackBuild b/source/l/QScintilla/QScintilla.SlackBuild index 6b70950e1..756a5cf63 100755 --- a/source/l/QScintilla/QScintilla.SlackBuild +++ b/source/l/QScintilla/QScintilla.SlackBuild @@ -29,7 +29,7 @@ PKGNAM=QScintilla VERSION=${VERSION:-$(echo ${PKGNAM}_*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:--j7} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/l/SDL2/SDL2.SlackBuild b/source/l/SDL2/SDL2.SlackBuild index a9f5ddde8..525eb9f25 100755 --- a/source/l/SDL2/SDL2.SlackBuild +++ b/source/l/SDL2/SDL2.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/l/SDL2_gfx/SDL2_gfx.SlackBuild b/source/l/SDL2_gfx/SDL2_gfx.SlackBuild index 6702751de..18f2caf38 100755 --- a/source/l/SDL2_gfx/SDL2_gfx.SlackBuild +++ b/source/l/SDL2_gfx/SDL2_gfx.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/l/SDL2_image/SDL2_image.SlackBuild b/source/l/SDL2_image/SDL2_image.SlackBuild index dd4ffc974..8ef9c73ce 100755 --- a/source/l/SDL2_image/SDL2_image.SlackBuild +++ b/source/l/SDL2_image/SDL2_image.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/l/SDL2_mixer/SDL2_mixer.SlackBuild b/source/l/SDL2_mixer/SDL2_mixer.SlackBuild index 2e4879456..ce3b50291 100755 --- a/source/l/SDL2_mixer/SDL2_mixer.SlackBuild +++ b/source/l/SDL2_mixer/SDL2_mixer.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/l/SDL2_net/SDL2_net.SlackBuild b/source/l/SDL2_net/SDL2_net.SlackBuild index 822a47fd5..5ffb6ac8d 100755 --- a/source/l/SDL2_net/SDL2_net.SlackBuild +++ b/source/l/SDL2_net/SDL2_net.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/l/SDL2_ttf/SDL2_ttf.SlackBuild b/source/l/SDL2_ttf/SDL2_ttf.SlackBuild index 32d6b7385..f4b62637a 100755 --- a/source/l/SDL2_ttf/SDL2_ttf.SlackBuild +++ b/source/l/SDL2_ttf/SDL2_ttf.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/l/a52dec/a52dec.SlackBuild b/source/l/a52dec/a52dec.SlackBuild index 4e8b70de8..cfd7991ba 100755 --- a/source/l/a52dec/a52dec.SlackBuild +++ b/source/l/a52dec/a52dec.SlackBuild @@ -46,7 +46,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:--j6} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" diff --git a/source/l/aalib/aalib.SlackBuild b/source/l/aalib/aalib.SlackBuild index 14a8d41aa..c3f685ffa 100755 --- a/source/l/aalib/aalib.SlackBuild +++ b/source/l/aalib/aalib.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/l/adwaita-icon-theme/adwaita-icon-theme.SlackBuild b/source/l/adwaita-icon-theme/adwaita-icon-theme.SlackBuild index f3fe2b19c..72cb9da05 100755 --- a/source/l/adwaita-icon-theme/adwaita-icon-theme.SlackBuild +++ b/source/l/adwaita-icon-theme/adwaita-icon-theme.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=adwaita-icon-theme 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/l/akonadi/akonadi.SlackBuild b/source/l/akonadi/akonadi.SlackBuild index 851f707b9..2bdb88f7a 100755 --- a/source/l/akonadi/akonadi.SlackBuild +++ b/source/l/akonadi/akonadi.SlackBuild @@ -29,7 +29,7 @@ PKGNAM=akonadi VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-10} -NUMJOBS=${NUMJOBS:--j7} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) diff --git a/source/l/alsa-lib/alsa-lib.SlackBuild b/source/l/alsa-lib/alsa-lib.SlackBuild index 44a216e04..7138eeeff 100755 --- a/source/l/alsa-lib/alsa-lib.SlackBuild +++ b/source/l/alsa-lib/alsa-lib.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=alsa-lib VERSION=${VERSION:-$(echo alsa-lib-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-3} -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/l/alsa-oss/alsa-oss.SlackBuild b/source/l/alsa-oss/alsa-oss.SlackBuild index 5f938fd09..d7cd02929 100755 --- a/source/l/alsa-oss/alsa-oss.SlackBuild +++ b/source/l/alsa-oss/alsa-oss.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-alsa-oss @@ -76,6 +76,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +zcat $CWD/alsa-oss.glibc228.diff.gz | patch -p1 --verbose || exit 1 + CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/source/l/alsa-oss/alsa-oss.glibc228.diff b/source/l/alsa-oss/alsa-oss.glibc228.diff new file mode 100644 index 000000000..d44b38065 --- /dev/null +++ b/source/l/alsa-oss/alsa-oss.glibc228.diff @@ -0,0 +1,10 @@ +--- ./alsa/stdioemu.c.orig 2018-04-03 02:01:38.000000000 -0500 ++++ ./alsa/stdioemu.c 2018-09-18 18:42:01.227057630 -0500 +@@ -37,7 +37,6 @@ + #endif + + #include <stdio.h> +-#include <libio.h> + + struct fd_cookie { + int fd; diff --git a/source/l/alsa-plugins/alsa-plugins.SlackBuild b/source/l/alsa-plugins/alsa-plugins.SlackBuild index 188663ea5..bd13dcd3e 100755 --- a/source/l/alsa-plugins/alsa-plugins.SlackBuild +++ b/source/l/alsa-plugins/alsa-plugins.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=alsa-plugins 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) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/l/apr-util/apr-util.SlackBuild b/source/l/apr-util/apr-util.SlackBuild index 267c72ceb..70c23036c 100755 --- a/source/l/apr-util/apr-util.SlackBuild +++ b/source/l/apr-util/apr-util.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/l/apr/apr.SlackBuild b/source/l/apr/apr.SlackBuild index b43764b98..2decd1456 100755 --- a/source/l/apr/apr.SlackBuild +++ b/source/l/apr/apr.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/l/aspell/aspell.SlackBuild b/source/l/aspell/aspell.SlackBuild index 02cd5a4d8..0dd1bec35 100755 --- a/source/l/aspell/aspell.SlackBuild +++ b/source/l/aspell/aspell.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/l/at-spi2-atk/at-spi2-atk.SlackBuild b/source/l/at-spi2-atk/at-spi2-atk.SlackBuild index b43316d91..9e30c1170 100755 --- a/source/l/at-spi2-atk/at-spi2-atk.SlackBuild +++ b/source/l/at-spi2-atk/at-spi2-atk.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/l/at-spi2-core/at-spi2-core.SlackBuild b/source/l/at-spi2-core/at-spi2-core.SlackBuild index 39e640f8e..95fa8c7a1 100755 --- a/source/l/at-spi2-core/at-spi2-core.SlackBuild +++ b/source/l/at-spi2-core/at-spi2-core.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/l/atk/atk.SlackBuild b/source/l/atk/atk.SlackBuild index 696a5a6ac..ddcf78cf8 100755 --- a/source/l/atk/atk.SlackBuild +++ b/source/l/atk/atk.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=atk 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/l/atkmm/atkmm.SlackBuild b/source/l/atkmm/atkmm.SlackBuild index 3eb76e62d..8c1d0a6e5 100755 --- a/source/l/atkmm/atkmm.SlackBuild +++ b/source/l/atkmm/atkmm.SlackBuild @@ -42,7 +42,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/l/attica/attica.SlackBuild b/source/l/attica/attica.SlackBuild index 29caa7f13..fc906ed28 100755 --- a/source/l/attica/attica.SlackBuild +++ b/source/l/attica/attica.SlackBuild @@ -27,7 +27,7 @@ PKGNAM=attica 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: MARCH=$( uname -m ) diff --git a/source/l/audiofile/audiofile.SlackBuild b/source/l/audiofile/audiofile.SlackBuild index 47200047a..e5a758c49 100755 --- a/source/l/audiofile/audiofile.SlackBuild +++ b/source/l/audiofile/audiofile.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/l/automoc4/automoc4.SlackBuild b/source/l/automoc4/automoc4.SlackBuild index 9696f390f..c0f3db3d5 100755 --- a/source/l/automoc4/automoc4.SlackBuild +++ b/source/l/automoc4/automoc4.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-automoc4 diff --git a/source/l/babl/babl.SlackBuild b/source/l/babl/babl.SlackBuild index 5122aa880..522dbd0db 100755 --- a/source/l/babl/babl.SlackBuild +++ b/source/l/babl/babl.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-babl diff --git a/source/l/boost/boost.SlackBuild b/source/l/boost/boost.SlackBuild index a25c555d6..231d36078 100755 --- a/source/l/boost/boost.SlackBuild +++ b/source/l/boost/boost.SlackBuild @@ -33,7 +33,7 @@ VERSION=${VERSION:-$(echo $PKGNAM_*.tar.?z | rev | cut -f 3- -d . | rev | cut -f BUILD=${BUILD:-1} PKG_VERSION=$(echo $VERSION | tr _ .) # Leave this alone -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) diff --git a/source/l/cairo/cairo.SlackBuild b/source/l/cairo/cairo.SlackBuild index faed7d184..3af950e6e 100755 --- a/source/l/cairo/cairo.SlackBuild +++ b/source/l/cairo/cairo.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/l/cairomm/cairomm.SlackBuild b/source/l/cairomm/cairomm.SlackBuild index 824240562..0abbc11b0 100755 --- a/source/l/cairomm/cairomm.SlackBuild +++ b/source/l/cairomm/cairomm.SlackBuild @@ -42,7 +42,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/l/chmlib/chmlib.SlackBuild b/source/l/chmlib/chmlib.SlackBuild index cf5bf8e55..e554bc77c 100755 --- a/source/l/chmlib/chmlib.SlackBuild +++ b/source/l/chmlib/chmlib.SlackBuild @@ -45,7 +45,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-chmlib diff --git a/source/l/clucene/clucene.SlackBuild b/source/l/clucene/clucene.SlackBuild index c1290d696..d3a5f57f3 100755 --- a/source/l/clucene/clucene.SlackBuild +++ b/source/l/clucene/clucene.SlackBuild @@ -31,7 +31,7 @@ PKGNAM=clucene VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-3} -NUMJOBS=${NUMJOBS:--j7} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) diff --git a/source/l/db48/db48.SlackBuild b/source/l/db48/db48.SlackBuild index 4d3060233..a1329e527 100755 --- a/source/l/db48/db48.SlackBuild +++ b/source/l/db48/db48.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=db48 VERSION=4.8.30 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/l/dbus-glib/dbus-glib.SlackBuild b/source/l/dbus-glib/dbus-glib.SlackBuild index 42e603a06..c37331b28 100755 --- a/source/l/dbus-glib/dbus-glib.SlackBuild +++ b/source/l/dbus-glib/dbus-glib.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/l/dbus-python/dbus-python.SlackBuild b/source/l/dbus-python/dbus-python.SlackBuild index 0ac00f368..bfed0921b 100755 --- a/source/l/dbus-python/dbus-python.SlackBuild +++ b/source/l/dbus-python/dbus-python.SlackBuild @@ -29,7 +29,7 @@ PKGNAM=dbus-python VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | 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/l/dconf-editor/dconf-editor.SlackBuild b/source/l/dconf-editor/dconf-editor.SlackBuild index 4a91ae1c2..4da30bbec 100755 --- a/source/l/dconf-editor/dconf-editor.SlackBuild +++ b/source/l/dconf-editor/dconf-editor.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/l/dconf/dconf.SlackBuild b/source/l/dconf/dconf.SlackBuild index 561f6a342..d89f258df 100755 --- a/source/l/dconf/dconf.SlackBuild +++ b/source/l/dconf/dconf.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/l/desktop-file-utils/desktop-file-utils.SlackBuild b/source/l/desktop-file-utils/desktop-file-utils.SlackBuild index f9af84aaf..5028e30fc 100755 --- a/source/l/desktop-file-utils/desktop-file-utils.SlackBuild +++ b/source/l/desktop-file-utils/desktop-file-utils.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=desktop-file-utils 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/l/ebook-tools/ebook-tools.SlackBuild b/source/l/ebook-tools/ebook-tools.SlackBuild index 8ffdb27ee..890eae2d0 100755 --- a/source/l/ebook-tools/ebook-tools.SlackBuild +++ b/source/l/ebook-tools/ebook-tools.SlackBuild @@ -27,7 +27,7 @@ PKGNAM=ebook-tools VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-5} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) diff --git a/source/l/elfutils/elfutils.SlackBuild b/source/l/elfutils/elfutils.SlackBuild index 367b70120..8c4e544c7 100755 --- a/source/l/elfutils/elfutils.SlackBuild +++ b/source/l/elfutils/elfutils.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/l/enchant/enchant.SlackBuild b/source/l/enchant/enchant.SlackBuild index 7be0abd17..93bc2c962 100755 --- a/source/l/enchant/enchant.SlackBuild +++ b/source/l/enchant/enchant.SlackBuild @@ -29,7 +29,7 @@ PKGNAM=enchant 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/l/esound/esound.SlackBuild b/source/l/esound/esound.SlackBuild index b3261e5c8..b2fc53c6b 100755 --- a/source/l/esound/esound.SlackBuild +++ b/source/l/esound/esound.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=esound VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-3} -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/l/exiv2/exiv2.SlackBuild b/source/l/exiv2/exiv2.SlackBuild index 072bbfd91..551a616c1 100755 --- a/source/l/exiv2/exiv2.SlackBuild +++ b/source/l/exiv2/exiv2.SlackBuild @@ -50,7 +50,7 @@ fi TMP=${TMP:-/tmp} PKG=$TMP/package-exiv2 -NUMJOBS=${NUMJOBS:--j6} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" diff --git a/source/l/expat/expat.SlackBuild b/source/l/expat/expat.SlackBuild index 5183fd276..0d62ff02d 100755 --- a/source/l/expat/expat.SlackBuild +++ b/source/l/expat/expat.SlackBuild @@ -58,7 +58,7 @@ else LIBDIRSUFFIX="" fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-expat diff --git a/source/l/ffmpeg/ffmpeg.SlackBuild b/source/l/ffmpeg/ffmpeg.SlackBuild index d52ce3261..1183a4cc0 100755 --- a/source/l/ffmpeg/ffmpeg.SlackBuild +++ b/source/l/ffmpeg/ffmpeg.SlackBuild @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=ffmpeg VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -43,7 +43,7 @@ fi TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" @@ -147,7 +147,7 @@ opencl="" ; [ "${OPENCL:-yes}" != "no" ] && opencl="--enable-opencl" opengl="" ; [ "${OPENGL:-yes}" != "no" ] && opengl="--enable-opengl" openjpeg="" ; [ "${JP2:-yes}" != "no" ] && openjpeg="--enable-libopenjpeg" pulse="" ; [ "${PULSEAUDIO:-yes}" != "no" ] && pulse="--enable-libpulse" -samba="" ; [ "${SAMBA:-yes}" != "no" ] && samba="--enable-libsmbclient" +samba="" ; [ "${SAMBA:-no}" != "no" ] && samba="--enable-libsmbclient" wavpack="" ; [ "${WAVPACK:-yes}" != "no" ] && wavpack="--enable-libwavpack" # No default patent encumbered features: diff --git a/source/l/fftw/fftw.SlackBuild b/source/l/fftw/fftw.SlackBuild index 77a155494..95e2fd8d5 100755 --- a/source/l/fftw/fftw.SlackBuild +++ b/source/l/fftw/fftw.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=fftw VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -f 2- -d - | 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/l/fluidsynth/fluidsynth.SlackBuild b/source/l/fluidsynth/fluidsynth.SlackBuild index 2ce8c3f8e..43f83bb81 100755 --- a/source/l/fluidsynth/fluidsynth.SlackBuild +++ b/source/l/fluidsynth/fluidsynth.SlackBuild @@ -28,7 +28,7 @@ PKGNAM=fluidsynth VERSION=$(printf ${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/l/freetype/freetype.SlackBuild b/source/l/freetype/freetype.SlackBuild index 39ffbca96..690b431b1 100755 --- a/source/l/freetype/freetype.SlackBuild +++ b/source/l/freetype/freetype.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=freetype VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | 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/l/fribidi/fribidi.SlackBuild b/source/l/fribidi/fribidi.SlackBuild index da72df308..ab1ebd7e7 100755 --- a/source/l/fribidi/fribidi.SlackBuild +++ b/source/l/fribidi/fribidi.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/l/fuse/fuse.SlackBuild b/source/l/fuse/fuse.SlackBuild index 80b23fd34..c8d98431f 100755 --- a/source/l/fuse/fuse.SlackBuild +++ b/source/l/fuse/fuse.SlackBuild @@ -29,7 +29,7 @@ PKGNAM=fuse VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | 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/l/gamin/gamin.SlackBuild b/source/l/gamin/gamin.SlackBuild index ad1f08a95..8f532bf9e 100755 --- a/source/l/gamin/gamin.SlackBuild +++ b/source/l/gamin/gamin.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/l/gc/gc.SlackBuild b/source/l/gc/gc.SlackBuild index d8f58bde6..871f7784b 100755 --- a/source/l/gc/gc.SlackBuild +++ b/source/l/gc/gc.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/l/gcr/gcr.SlackBuild b/source/l/gcr/gcr.SlackBuild index 310968857..7f5d60d5e 100755 --- a/source/l/gcr/gcr.SlackBuild +++ b/source/l/gcr/gcr.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/l/gd/gd.SlackBuild b/source/l/gd/gd.SlackBuild index 6629857f6..f869d5705 100755 --- a/source/l/gd/gd.SlackBuild +++ b/source/l/gd/gd.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/l/gdbm/gdbm.SlackBuild b/source/l/gdbm/gdbm.SlackBuild index d6f8100ff..3983d9574 100755 --- a/source/l/gdbm/gdbm.SlackBuild +++ b/source/l/gdbm/gdbm.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-gdbm diff --git a/source/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild b/source/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild index 9587f2bd7..6b4abe259 100755 --- a/source/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild +++ b/source/l/gdk-pixbuf2/gdk-pixbuf2.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/l/gegl/gegl.SlackBuild b/source/l/gegl/gegl.SlackBuild index 5a2d91ded..269d4d423 100755 --- a/source/l/gegl/gegl.SlackBuild +++ b/source/l/gegl/gegl.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-gegl diff --git a/source/l/gexiv2/gexiv2.SlackBuild b/source/l/gexiv2/gexiv2.SlackBuild index 6db9ce166..108030d2d 100755 --- a/source/l/gexiv2/gexiv2.SlackBuild +++ b/source/l/gexiv2/gexiv2.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/l/giflib/giflib.SlackBuild b/source/l/giflib/giflib.SlackBuild index 07cb6a066..1d874b07c 100755 --- a/source/l/giflib/giflib.SlackBuild +++ b/source/l/giflib/giflib.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=giflib VERSION=${VERSION:-$(echo giflib-*.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/l/glade3/glade3.SlackBuild b/source/l/glade3/glade3.SlackBuild index 987807888..4385ae669 100755 --- a/source/l/glade3/glade3.SlackBuild +++ b/source/l/glade3/glade3.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/l/glib-networking/glib-networking.SlackBuild b/source/l/glib-networking/glib-networking.SlackBuild index 4a08b3773..26c0befbc 100755 --- a/source/l/glib-networking/glib-networking.SlackBuild +++ b/source/l/glib-networking/glib-networking.SlackBuild @@ -28,7 +28,7 @@ PKGNAM=glib-networking VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/glib2/glib2.SlackBuild b/source/l/glib2/glib2.SlackBuild index ff7b4b892..be35aa0b0 100755 --- a/source/l/glib2/glib2.SlackBuild +++ b/source/l/glib2/glib2.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=glib2 VERSION=${VERSION:-$(echo glib-*.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/l/glibc/doinst.sh-glibc b/source/l/glibc/doinst.sh-glibc index 4ce7c1a08..e2c7d3ef1 100644 --- a/source/l/glibc/doinst.sh-glibc +++ b/source/l/glibc/doinst.sh-glibc @@ -84,7 +84,7 @@ if [ -x /sbin/ldconfig -a -d lib/incoming ]; then # swap on the fly done ) ) 9> run/lock/pkgtools/ldconfig.lock -else # no ldconfig? Good, it's safe to just jam it on home (and make links below): +else # no ldconfig? This is a broken situation, but we will do what we can: ( cd lib/incoming for file in * ; do cp -a $file .. @@ -114,6 +114,11 @@ config etc/profile.d/glibc.sh.new rm -f etc/profile.d/glibc.csh.new rm -f etc/profile.d/glibc.sh.new +# This block below *should* be dead code, but it's probably safer to leave it +# here as a fallback. It no longer has complete coverage of all the links +# that would be needed in /lib${LIBDIRSUFFIX}, but it covers enough that if +# we did fall back on this the machine would boot until it reached the boot +# time call to ldconfig, which would then take care of any missing links. # In case there's no ldconfig, make the links manually: if [ ! -x /sbin/ldconfig ]; then ( cd lib ; rm -rf libnss_nis.so.2 ) @@ -157,43 +162,3 @@ if [ ! -x /sbin/ldconfig ]; then fi # More links: -( cd usr/lib ; rm -rf libnss_nisplus.so ) -( cd usr/lib ; ln -sf ../../lib/libnss_nisplus.so.2 libnss_nisplus.so ) -# This is now a linker script: -#( cd usr/lib ; rm -rf libpthread.so ) -#( cd usr/lib ; ln -sf ../../lib/libpthread.so.0 libpthread.so ) -( cd usr/lib ; rm -rf libresolv.so ) -( cd usr/lib ; ln -sf ../../lib/libresolv.so.2 libresolv.so ) -( cd usr/lib ; rm -rf libnsl.so ) -( cd usr/lib ; ln -sf ../../lib/libnsl.so.1 libnsl.so ) -( cd usr/lib ; rm -rf libnss_hesiod.so ) -( cd usr/lib ; ln -sf ../../lib/libnss_hesiod.so.2 libnss_hesiod.so ) -( cd usr/lib ; rm -rf libnss_files.so ) -( cd usr/lib ; ln -sf ../../lib/libnss_files.so.2 libnss_files.so ) -# This is now a linker script: -#( cd usr/lib ; rm -rf libm.so ) -#( cd usr/lib ; ln -sf ../../lib/libm.so.6 libm.so ) -( cd usr/lib ; rm -rf libutil.so ) -( cd usr/lib ; ln -sf ../../lib/libutil.so.1 libutil.so ) -( cd usr/lib ; rm -rf libnss_compat.so ) -( cd usr/lib ; ln -sf ../../lib/libnss_compat.so.2 libnss_compat.so ) -( cd usr/lib ; rm -rf libthread_db.so ) -( cd usr/lib ; ln -sf ../../lib/libthread_db.so.1 libthread_db.so ) -( cd usr/lib ; rm -rf libcrypt.so ) -( cd usr/lib ; ln -sf ../../lib/libcrypt.so.1 libcrypt.so ) -( cd usr/lib ; rm -rf libBrokenLocale.so ) -( cd usr/lib ; ln -sf ../../lib/libBrokenLocale.so.1 libBrokenLocale.so ) -( cd usr/lib ; rm -rf libdl.so ) -( cd usr/lib ; ln -sf ../../lib/libdl.so.2 libdl.so ) -( cd usr/lib ; rm -rf libnss_dns.so ) -( cd usr/lib ; ln -sf ../../lib/libnss_dns.so.2 libnss_dns.so ) -( cd usr/lib ; rm -rf librt.so ) -( cd usr/lib ; ln -sf ../../lib/librt.so.1 librt.so ) -( cd usr/lib ; rm -rf libanl.so ) -( cd usr/lib ; ln -sf ../../lib/libanl.so.1 libanl.so ) -( cd usr/lib ; rm -rf libnss_nis.so ) -( cd usr/lib ; ln -sf ../../lib/libnss_nis.so.2 libnss_nis.so ) -( cd usr/share/zoneinfo ; rm -rf localtime ) -( cd usr/share/zoneinfo ; ln -sf /etc/localtime localtime ) -( cd bin ; rm -rf sln ) -( cd bin ; ln -sf /sbin/sln sln ) diff --git a/source/l/glibc/doinst.sh-glibc-solibs b/source/l/glibc/doinst.sh-glibc-solibs index 570f427d7..3d4466043 100644 --- a/source/l/glibc/doinst.sh-glibc-solibs +++ b/source/l/glibc/doinst.sh-glibc-solibs @@ -84,7 +84,7 @@ if [ -x /sbin/ldconfig -a -d lib/incoming ]; then # swap on the fly done ) ) 9> run/lock/pkgtools/ldconfig.lock -else # no ldconfig? Good, it's safe to just jam it on home (and make links below): +else # no ldconfig? This is a broken situation, but we will do what we can: ( cd lib/incoming for file in * ; do cp -a $file .. @@ -113,7 +113,11 @@ config etc/profile.d/glibc.sh.new rm -f etc/profile.d/glibc.csh.new rm -f etc/profile.d/glibc.sh.new -# In case there's no ldconfig, make the links manually: +# This block below *should* be dead code, but it's probably safer to leave it +# here as a fallback. It no longer has complete coverage of all the links +# that would be needed in /lib${LIBDIRSUFFIX}, but it covers enough that if +# we did fall back on this the machine would boot until it reached the boot +# time call to ldconfig, which would then take care of any missing links. if [ ! -x /sbin/ldconfig ]; then ( cd lib ; rm -rf libnss_nis.so.2 ) ( cd lib ; ln -sf libnss_nis-@@VERSION@@.so libnss_nis.so.2 ) @@ -154,3 +158,4 @@ if [ ! -x /sbin/ldconfig ]; then ( cd lib ; rm -rf librt.so.1 ) ( cd lib ; ln -sf librt-@@VERSION@@.so librt.so.1 ) fi + diff --git a/source/l/glibc/glibc.SlackBuild b/source/l/glibc/glibc.SlackBuild index 4bb09e632..33b4c6021 100755 --- a/source/l/glibc/glibc.SlackBuild +++ b/source/l/glibc/glibc.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=glibc VERSION=${VERSION:-$(echo glibc-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} CHECKOUT=${CHECKOUT:-""} -BUILD=${BUILD:-4} +BUILD=${BUILD:-2} # I was considering disabling NSCD, but MoZes talked me out of it. :) #DISABLE_NSCD=" --disable-nscd " @@ -155,8 +155,6 @@ apply_patches() { zcat $CWD/glibc.ru_RU.CP1251.diff.gz | patch -p1 --verbose || exit 1 # Add a C.UTF-8 locale: zcat $CWD/glibc-c-utf8-locale.patch.gz | patch -p1 --verbose || exit 1 - # Linux: use reserved name __key in pkey_get [BZ #22797]: - zcat $CWD/glibc.pkey_get.56170e0.diff.gz | patch -p1 --verbose || exit 1 } # This is going to be the initial $DESTDIR: @@ -249,6 +247,25 @@ make $NUMJOBS || make || exit 1 make install install_root=$PKG || exit 1 make localedata/install-locales install_root=$PKG || exit 1 +# We've always had an sln symlink in /bin, so let's make sure it +# remains there so as not to break any scripts that might need it: +mkdir -p $PKG/bin +( cd $PKG/bin ; ln -sf /sbin/sln sln ) + +# This bit was mostly copped from Fedora Rawhide's .spec file. I'm not +# entirely sure how important it is, since I'm not aware of anything +# we ship trying to link libpthread as static. What it does is make sure +# that anything linking libpthread static includes all of the functions +# so that the resulting binary doesn't rely on parts of the library that +# were not linked in. Optimizing actually working over binary size, so +# to speak. +( cd $PKG/usr/lib${LIBDIRSUFFIX} + gcc -r -nostdlib -o libpthread.o -Wl,--whole-archive ./libpthread.a + rm libpthread.a + ar rcs libpthread.a libpthread.o + rm libpthread.o +) + # The prevailing standard seems to be putting unstripped libraries in # /usr/lib/debug/ and stripping the debugging symbols from all the other # libraries. @@ -392,9 +409,6 @@ mkdir -p usr/lib${LIBDIRSUFFIX} # The gconv directory has a lot of stuff, but including it here will save some problems. # Seems standard elsewhere. cp -a $PKG/usr/lib${LIBDIRSUFFIX}/gconv usr/lib${LIBDIRSUFFIX} -# Another manpage abandoned by GNU... -#mkdir -p usr/man/man1 -#cp -a $PKG/usr/man/man1/ldd.1.gz usr/man/man1 mkdir -p usr/libexec cp -a $PKG/usr/libexec/pt_chown usr/libexec # Same usr.bin deal: @@ -405,10 +419,15 @@ mv ldconfig sbin mkdir install cp -a $CWD/slack-desc.glibc-solibs install/slack-desc cp -a $CWD/doinst.sh-glibc-solibs install/doinst.sh -fix_doinst +# Fix specific versioning for the symlink creation script. This part of the +# script would only be used in the case where there is no ldconfig on the +# running system that's used to install the package. That should never be the +# case, but we'll leave the code in place anyway just in case. sed -i "s/@@VERSION@@/$VERSION/g" install/doinst.sh -# Ditch links: -find . -type l -exec rm {} \; +# Call the function to fix doinst.sh where $LIBDIRSUFFIX is needed: +fix_doinst +# Only scrub the links in /lib{,64} that will be created by ldconfig: +find lib${LIBDIRSUFFIX} -type l -exec rm {} \; # Build the package: makepkg -l y -c n $TMP/glibc-solibs-$VERSION-$SLACKWARE_ARCH-$BUILD.txz @@ -420,18 +439,18 @@ mkdir -p etc/profile.d cp -a $CWD/profile.d/* etc/profile.d chown -R root:root etc chmod 755 etc/profile.d/* -# Ditch links (these are in doinst.sh-glibc): -find . -type l -exec rm {} \; -# libm.so is *not* a linker script on all $ARCH. -# If it's missing now, replace the symlink: -if [ ! -r usr/lib${LIBDIRSUFFIX}/libm.so ]; then - ( cd usr/lib${LIBDIRSUFFIX} ; ln -sf ../../lib${LIBDIRSUFFIX}/libm.so.6 libm.so ) -fi +# Only scrub the links in /lib{,64} that will be created by ldconfig: +find lib${LIBDIRSUFFIX} -type l -exec rm {} \; mkdir install cp -a $CWD/slack-desc.glibc install/slack-desc cp -a $CWD/doinst.sh-glibc install/doinst.sh -fix_doinst +# Fix specific versioning for the symlink creation script. This part of the +# script would only be used in the case where there is no ldconfig on the +# running system that's used to install the package. That should never be the +# case, but we'll leave the code in place anyway just in case. sed -i "s/@@VERSION@@/$VERSION/g" install/doinst.sh +# Call the function to fix doinst.sh where $LIBDIRSUFFIX is needed: +fix_doinst ( cd lib${LIBDIRSUFFIX} mkdir incoming mv *so* incoming @@ -443,4 +462,3 @@ sed -i "s/@@VERSION@@/$VERSION/g" install/doinst.sh # Done! echo echo "glibc packages built in $TMP!" - diff --git a/source/l/glibc/glibc.pkey_get.56170e0.diff b/source/l/glibc/glibc.pkey_get.56170e0.diff deleted file mode 100644 index d7111fbae..000000000 --- a/source/l/glibc/glibc.pkey_get.56170e0.diff +++ /dev/null @@ -1,28 +0,0 @@ -From 56170e064e2b21ce204f0817733e92f1730541ea Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko <ignatenko@redhat.com> -Date: Wed, 7 Feb 2018 13:53:10 +0100 -Subject: [PATCH] Linux: use reserved name __key in pkey_get [BZ #22797] - -_key is not reserved name and we should avoid using that. It seems that -it was simple typo when pkey_* was implemented. - -(cherry picked from commit 388ff7bd0d57d7061fdd39a2f26f65687e8058da) ---- - sysdeps/unix/sysv/linux/bits/mman-shared.h | 2 +- - 1 files changed, 8 insertions(+), 1 deletion(-) - -diff --git a/sysdeps/unix/sysv/linux/bits/mman-shared.h b/sysdeps/unix/sysv/linux/bits/mman-shared.h -index 7715e68..d15ba95 100644 ---- a/sysdeps/unix/sysv/linux/bits/mman-shared.h -+++ b/sysdeps/unix/sysv/linux/bits/mman-shared.h -@@ -61,7 +61,7 @@ int pkey_set (int __key, unsigned int __access_rights) __THROW; - - /* Return the access rights for the current thread for KEY, which must - have been allocated using pkey_alloc. */ --int pkey_get (int _key) __THROW; -+int pkey_get (int __key) __THROW; - - /* Free an allocated protection key, which must have been allocated - using pkey_alloc. */ --- -2.9.3 diff --git a/source/l/glibmm/glibmm.SlackBuild b/source/l/glibmm/glibmm.SlackBuild index b0878202d..7c506d422 100755 --- a/source/l/glibmm/glibmm.SlackBuild +++ b/source/l/glibmm/glibmm.SlackBuild @@ -42,7 +42,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/l/gmime/gmime.SlackBuild b/source/l/gmime/gmime.SlackBuild index 81824a3dd..6956639b6 100755 --- a/source/l/gmime/gmime.SlackBuild +++ b/source/l/gmime/gmime.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gmime VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: diff --git a/source/l/gmm/gmm.SlackBuild b/source/l/gmm/gmm.SlackBuild index cc803afc0..99751b1cc 100755 --- a/source/l/gmm/gmm.SlackBuild +++ b/source/l/gmm/gmm.SlackBuild @@ -29,7 +29,7 @@ PKGNAM=gmm VERSION=4.3 ARCH=noarch BUILD=${BUILD:-2} -NUMJOBS=${NUMJOBS:--j6} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # If the variable PRINT_PACKAGE_NAME is set, then this script will report what # the name of the created package would be, and then exit. This information diff --git a/source/l/gmp/gmp.SlackBuild b/source/l/gmp/gmp.SlackBuild index c9f0f793c..e09e448a1 100755 --- a/source/l/gmp/gmp.SlackBuild +++ b/source/l/gmp/gmp.SlackBuild @@ -48,7 +48,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-gmp diff --git a/source/l/gnome-keyring/gnome-keyring.SlackBuild b/source/l/gnome-keyring/gnome-keyring.SlackBuild index 4374d8773..823188d69 100755 --- a/source/l/gnome-keyring/gnome-keyring.SlackBuild +++ b/source/l/gnome-keyring/gnome-keyring.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/l/gnome-themes-standard/gnome-themes-standard.SlackBuild b/source/l/gnome-themes-standard/gnome-themes-standard.SlackBuild index c527377d5..23f98d5e1 100755 --- a/source/l/gnome-themes-standard/gnome-themes-standard.SlackBuild +++ b/source/l/gnome-themes-standard/gnome-themes-standard.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/l/gobject-introspection/gobject-introspection.SlackBuild b/source/l/gobject-introspection/gobject-introspection.SlackBuild index 07bc55e6e..e67ea93a2 100755 --- a/source/l/gobject-introspection/gobject-introspection.SlackBuild +++ b/source/l/gobject-introspection/gobject-introspection.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/l/grantlee/grantlee.SlackBuild b/source/l/grantlee/grantlee.SlackBuild index 599cb746c..a17db0fa0 100755 --- a/source/l/grantlee/grantlee.SlackBuild +++ b/source/l/grantlee/grantlee.SlackBuild @@ -27,7 +27,7 @@ PKGNAM=grantlee 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: MARCH=$( uname -m ) diff --git a/source/l/gsl/gsl.SlackBuild b/source/l/gsl/gsl.SlackBuild index f74f2253c..89f6a76b6 100755 --- a/source/l/gsl/gsl.SlackBuild +++ b/source/l/gsl/gsl.SlackBuild @@ -30,7 +30,7 @@ PKGNAM=gsl VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | 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: MARCH=$( uname -m ) diff --git a/source/l/gst-plugins-base/gst-plugins-base.SlackBuild b/source/l/gst-plugins-base/gst-plugins-base.SlackBuild index 7c3c26ecf..dff2ee524 100755 --- a/source/l/gst-plugins-base/gst-plugins-base.SlackBuild +++ b/source/l/gst-plugins-base/gst-plugins-base.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/l/gst-plugins-base0/gst-plugins-base0.SlackBuild b/source/l/gst-plugins-base0/gst-plugins-base0.SlackBuild index b768046a8..f00837526 100755 --- a/source/l/gst-plugins-base0/gst-plugins-base0.SlackBuild +++ b/source/l/gst-plugins-base0/gst-plugins-base0.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}0 diff --git a/source/l/gst-plugins-good/gst-plugins-good.SlackBuild b/source/l/gst-plugins-good/gst-plugins-good.SlackBuild index 255b6e279..2444a9644 100755 --- a/source/l/gst-plugins-good/gst-plugins-good.SlackBuild +++ b/source/l/gst-plugins-good/gst-plugins-good.SlackBuild @@ -39,7 +39,7 @@ if [ -z "$ARCH" ]; then esac fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/l/gst-plugins-good0/gst-plugins-good0.SlackBuild b/source/l/gst-plugins-good0/gst-plugins-good0.SlackBuild index bfe228808..1e8c0a798 100755 --- a/source/l/gst-plugins-good0/gst-plugins-good0.SlackBuild +++ b/source/l/gst-plugins-good0/gst-plugins-good0.SlackBuild @@ -39,7 +39,7 @@ if [ -z "$ARCH" ]; then esac fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM}0 diff --git a/source/l/gst-plugins-libav/gst-plugins-libav.SlackBuild b/source/l/gst-plugins-libav/gst-plugins-libav.SlackBuild index 5e5445890..401a8acd7 100755 --- a/source/l/gst-plugins-libav/gst-plugins-libav.SlackBuild +++ b/source/l/gst-plugins-libav/gst-plugins-libav.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/l/gstreamer/gstreamer.SlackBuild b/source/l/gstreamer/gstreamer.SlackBuild index dcedece92..db7c1d789 100755 --- a/source/l/gstreamer/gstreamer.SlackBuild +++ b/source/l/gstreamer/gstreamer.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/l/gstreamer0/gstreamer0.SlackBuild b/source/l/gstreamer0/gstreamer0.SlackBuild index cbc9e4b43..dc16d04e8 100755 --- a/source/l/gstreamer0/gstreamer0.SlackBuild +++ b/source/l/gstreamer0/gstreamer0.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/l/gtk+/gtk+.SlackBuild b/source/l/gtk+/gtk+.SlackBuild index 25a7ad8d0..2e1bf88cb 100755 --- a/source/l/gtk+/gtk+.SlackBuild +++ b/source/l/gtk+/gtk+.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/l/gtk+2/gtk+2.SlackBuild b/source/l/gtk+2/gtk+2.SlackBuild index e006023a1..a56a6563f 100755 --- a/source/l/gtk+2/gtk+2.SlackBuild +++ b/source/l/gtk+2/gtk+2.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=gtk+2 VERSION=${VERSION:-$(echo gtk+-*.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/l/gtk+3/gtk+3.SlackBuild b/source/l/gtk+3/gtk+3.SlackBuild index ab345c5d0..8e9207371 100755 --- a/source/l/gtk+3/gtk+3.SlackBuild +++ b/source/l/gtk+3/gtk+3.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=gtk+3 VERSION=${VERSION:-$(echo gtk+-*.tar.?z | 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/l/gtkmm2/gtkmm2.SlackBuild b/source/l/gtkmm2/gtkmm2.SlackBuild index 47aebe501..982c76d40 100755 --- a/source/l/gtkmm2/gtkmm2.SlackBuild +++ b/source/l/gtkmm2/gtkmm2.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/l/gtkmm3/gtkmm3.SlackBuild b/source/l/gtkmm3/gtkmm3.SlackBuild index cf56f1faf..2bce3ac90 100755 --- a/source/l/gtkmm3/gtkmm3.SlackBuild +++ b/source/l/gtkmm3/gtkmm3.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/l/gtkspell/gtkspell.SlackBuild b/source/l/gtkspell/gtkspell.SlackBuild index e84a057a1..fda23785d 100755 --- a/source/l/gtkspell/gtkspell.SlackBuild +++ b/source/l/gtkspell/gtkspell.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/l/gvfs/gvfs.SlackBuild b/source/l/gvfs/gvfs.SlackBuild index 9a330fd91..68cf0f0ad 100755 --- a/source/l/gvfs/gvfs.SlackBuild +++ b/source/l/gvfs/gvfs.SlackBuild @@ -27,7 +27,7 @@ PKGNAM=gvfs VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/harfbuzz/harfbuzz.SlackBuild b/source/l/harfbuzz/harfbuzz.SlackBuild index 85a0b6195..ca2cea445 100755 --- a/source/l/harfbuzz/harfbuzz.SlackBuild +++ b/source/l/harfbuzz/harfbuzz.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/l/hunspell/hunspell.SlackBuild b/source/l/hunspell/hunspell.SlackBuild index d383ed85e..2c1e4e06d 100755 --- a/source/l/hunspell/hunspell.SlackBuild +++ b/source/l/hunspell/hunspell.SlackBuild @@ -27,7 +27,7 @@ PKGNAM=hunspell 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) "} TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} diff --git a/source/l/icu4c/icu4c.SlackBuild b/source/l/icu4c/icu4c.SlackBuild index 0a355a345..46cc73923 100755 --- a/source/l/icu4c/icu4c.SlackBuild +++ b/source/l/icu4c/icu4c.SlackBuild @@ -48,7 +48,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-icu4c diff --git a/source/l/id3lib/id3lib.SlackBuild b/source/l/id3lib/id3lib.SlackBuild index ccae5744f..e44dbe700 100755 --- a/source/l/id3lib/id3lib.SlackBuild +++ b/source/l/id3lib/id3lib.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/l/ilmbase/ilmbase.SlackBuild b/source/l/ilmbase/ilmbase.SlackBuild index c3a274fcd..8e4e6f243 100755 --- a/source/l/ilmbase/ilmbase.SlackBuild +++ b/source/l/ilmbase/ilmbase.SlackBuild @@ -47,7 +47,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-$PKGNAM diff --git a/source/l/imagemagick/ImageMagick.fix.overloading.error.diff b/source/l/imagemagick/ImageMagick.fix.overloading.error.diff new file mode 100644 index 000000000..0306390fd --- /dev/null +++ b/source/l/imagemagick/ImageMagick.fix.overloading.error.diff @@ -0,0 +1,16 @@ +--- ./Magick++/lib/Magick++/Color.h.orig 2018-08-28 07:31:12.000000000 -0500 ++++ ./Magick++/lib/Magick++/Color.h 2018-09-20 21:57:14.555014712 -0500 +@@ -122,11 +122,12 @@ + { + return (static_cast<double>(quantum_)/QuantumRange); + } +-#endif ++#else + static double scaleQuantumToDouble(const double quantum_) + { + return (quantum_/QuantumRange); + } ++#endif + + protected: + diff --git a/source/l/imagemagick/imagemagick.SlackBuild b/source/l/imagemagick/imagemagick.SlackBuild index aab17f3f2..0741fbb2b 100755 --- a/source/l/imagemagick/imagemagick.SlackBuild +++ b/source/l/imagemagick/imagemagick.SlackBuild @@ -60,7 +60,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" @@ -103,6 +103,10 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Fix an error that only occurs on 32-bit, but I'm pretty sure that this +# needed an #else in there: +zcat $CWD/ImageMagick.fix.overloading.error.diff.gz | patch -p1 --verbose || exit 1 + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/l/iso-codes/iso-codes.SlackBuild b/source/l/iso-codes/iso-codes.SlackBuild index 9914a50df..96ccdf607 100755 --- a/source/l/iso-codes/iso-codes.SlackBuild +++ b/source/l/iso-codes/iso-codes.SlackBuild @@ -38,7 +38,7 @@ fi TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} rm -rf $PKG mkdir -p $TMP $PKG diff --git a/source/l/jansson/jansson.SlackBuild b/source/l/jansson/jansson.SlackBuild index f84928dab..3f75af78f 100755 --- a/source/l/jansson/jansson.SlackBuild +++ b/source/l/jansson/jansson.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/l/jasper/jasper.SlackBuild b/source/l/jasper/jasper.SlackBuild index 4c637d337..373069d0c 100755 --- a/source/l/jasper/jasper.SlackBuild +++ b/source/l/jasper/jasper.SlackBuild @@ -46,6 +46,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/l/jemalloc/jemalloc.SlackBuild b/source/l/jemalloc/jemalloc.SlackBuild index f2d1a4375..ced79afc8 100755 --- a/source/l/jemalloc/jemalloc.SlackBuild +++ b/source/l/jemalloc/jemalloc.SlackBuild @@ -45,7 +45,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:--j6} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-march=i586 -mtune=i686" diff --git a/source/l/jmtpfs/jmtpfs.SlackBuild b/source/l/jmtpfs/jmtpfs.SlackBuild index b8cb2b332..4525d118c 100755 --- a/source/l/jmtpfs/jmtpfs.SlackBuild +++ b/source/l/jmtpfs/jmtpfs.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/l/js185/js185.SlackBuild b/source/l/js185/js185.SlackBuild index 5592c96c1..24feaa63e 100755 --- a/source/l/js185/js185.SlackBuild +++ b/source/l/js185/js185.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/l/json-c/json-c.SlackBuild b/source/l/json-c/json-c.SlackBuild index 7099a59c5..0bfe5ba87 100755 --- a/source/l/json-c/json-c.SlackBuild +++ b/source/l/json-c/json-c.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/l/json-glib/json-glib.SlackBuild b/source/l/json-glib/json-glib.SlackBuild index fe74479f0..61801228c 100755 --- a/source/l/json-glib/json-glib.SlackBuild +++ b/source/l/json-glib/json-glib.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/l/judy/judy.SlackBuild b/source/l/judy/judy.SlackBuild index b4e098986..6e7e2be0a 100755 --- a/source/l/judy/judy.SlackBuild +++ b/source/l/judy/judy.SlackBuild @@ -43,7 +43,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:--j6} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" diff --git a/source/l/keybinder/keybinder.SlackBuild b/source/l/keybinder/keybinder.SlackBuild index 409c9bcab..950224bfb 100755 --- a/source/l/keybinder/keybinder.SlackBuild +++ b/source/l/keybinder/keybinder.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/l/keyutils/keyutils.SlackBuild b/source/l/keyutils/keyutils.SlackBuild index ab27b016c..4ec01d2b8 100755 --- a/source/l/keyutils/keyutils.SlackBuild +++ b/source/l/keyutils/keyutils.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/l/lame/lame.SlackBuild b/source/l/lame/lame.SlackBuild index b5d8048de..caee9816b 100755 --- a/source/l/lame/lame.SlackBuild +++ b/source/l/lame/lame.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/l/lcms/lcms.SlackBuild b/source/l/lcms/lcms.SlackBuild index 002e31542..3a2fde8b8 100755 --- a/source/l/lcms/lcms.SlackBuild +++ b/source/l/lcms/lcms.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/l/lcms2/lcms2.SlackBuild b/source/l/lcms2/lcms2.SlackBuild index 60c9194d8..b9a4b26eb 100755 --- a/source/l/lcms2/lcms2.SlackBuild +++ b/source/l/lcms2/lcms2.SlackBuild @@ -28,7 +28,7 @@ PKGNAM=lcms2 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: MARCH=$( uname -m ) diff --git a/source/l/libaio/libaio.SlackBuild b/source/l/libaio/libaio.SlackBuild index 14bccabdf..873c45808 100755 --- a/source/l/libaio/libaio.SlackBuild +++ b/source/l/libaio/libaio.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" = "x86_64" ]; then LIBDIRSUFFIX="64" diff --git a/source/l/libao/libao.SlackBuild b/source/l/libao/libao.SlackBuild index 33f91d902..f95056c45 100755 --- a/source/l/libao/libao.SlackBuild +++ b/source/l/libao/libao.SlackBuild @@ -36,7 +36,7 @@ if [ -z "$ARCH" ]; then esac fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" diff --git a/source/l/libarchive/libarchive.SlackBuild b/source/l/libarchive/libarchive.SlackBuild index c6530e21e..3941e3daa 100755 --- a/source/l/libarchive/libarchive.SlackBuild +++ b/source/l/libarchive/libarchive.SlackBuild @@ -47,7 +47,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-$PKGNAM diff --git a/source/l/libasyncns/libasyncns.SlackBuild b/source/l/libasyncns/libasyncns.SlackBuild index 074a0387f..a2a4d390b 100755 --- a/source/l/libasyncns/libasyncns.SlackBuild +++ b/source/l/libasyncns/libasyncns.SlackBuild @@ -31,7 +31,7 @@ PKGNAM=libasyncns VERSION=$(ls libasyncns-*.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/l/libatasmart/libatasmart.SlackBuild b/source/l/libatasmart/libatasmart.SlackBuild index 2c052c903..b9e26d149 100755 --- a/source/l/libatasmart/libatasmart.SlackBuild +++ b/source/l/libatasmart/libatasmart.SlackBuild @@ -30,7 +30,7 @@ PKGNAM=libatasmart VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-3} -NUMJOBS=${NUMJOBS:--j7} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) diff --git a/source/l/libbluedevil/libbluedevil.SlackBuild b/source/l/libbluedevil/libbluedevil.SlackBuild index ae3303ba5..39486a47b 100755 --- a/source/l/libbluedevil/libbluedevil.SlackBuild +++ b/source/l/libbluedevil/libbluedevil.SlackBuild @@ -27,7 +27,7 @@ PKGNAM=libbluedevil 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: MARCH=$( uname -m ) diff --git a/source/l/libbluray/libbluray.SlackBuild b/source/l/libbluray/libbluray.SlackBuild index 057c8d283..46fa148b3 100755 --- a/source/l/libbluray/libbluray.SlackBuild +++ b/source/l/libbluray/libbluray.SlackBuild @@ -46,7 +46,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:--j6} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" diff --git a/source/l/libcaca/libcaca.SlackBuild b/source/l/libcaca/libcaca.SlackBuild index c2accaa3a..e3afa664f 100755 --- a/source/l/libcaca/libcaca.SlackBuild +++ b/source/l/libcaca/libcaca.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/l/libcanberra/libcanberra.SlackBuild b/source/l/libcanberra/libcanberra.SlackBuild index 15e5a5b5e..c47e8ad9b 100755 --- a/source/l/libcanberra/libcanberra.SlackBuild +++ b/source/l/libcanberra/libcanberra.SlackBuild @@ -36,7 +36,7 @@ if [ -z "$ARCH" ]; then esac fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/l/libcap-ng/libcap-ng.SlackBuild b/source/l/libcap-ng/libcap-ng.SlackBuild index d84bb3edc..2b7c91ad8 100755 --- a/source/l/libcap-ng/libcap-ng.SlackBuild +++ b/source/l/libcap-ng/libcap-ng.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/l/libcap/libcap.SlackBuild b/source/l/libcap/libcap.SlackBuild index 1439dabfa..9b8c41192 100755 --- a/source/l/libcap/libcap.SlackBuild +++ b/source/l/libcap/libcap.SlackBuild @@ -28,7 +28,7 @@ PKGNAM=libcap VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | 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/l/libcddb/libcddb.SlackBuild b/source/l/libcddb/libcddb.SlackBuild index 54e37b990..f4ba3aa5d 100755 --- a/source/l/libcddb/libcddb.SlackBuild +++ b/source/l/libcddb/libcddb.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/l/libcdio-paranoia/libcdio-paranoia.SlackBuild b/source/l/libcdio-paranoia/libcdio-paranoia.SlackBuild index 0d6522369..894fabe2c 100755 --- a/source/l/libcdio-paranoia/libcdio-paranoia.SlackBuild +++ b/source/l/libcdio-paranoia/libcdio-paranoia.SlackBuild @@ -27,7 +27,7 @@ PKGNAM=libcdio-paranoia VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-3} -NUMJOBS=${NUMJOBS:--j7} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) diff --git a/source/l/libcdio/libcdio.SlackBuild b/source/l/libcdio/libcdio.SlackBuild index 46fa921f7..c9159cb82 100755 --- a/source/l/libcdio/libcdio.SlackBuild +++ b/source/l/libcdio/libcdio.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=libcdio 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) "} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/libclc/libclc.SlackBuild b/source/l/libclc/libclc.SlackBuild index 22fd8f508..5c4ad36d7 100755 --- a/source/l/libclc/libclc.SlackBuild +++ b/source/l/libclc/libclc.SlackBuild @@ -29,7 +29,7 @@ PKGNAM=libclc 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: MARCH=$( uname -m ) diff --git a/source/l/libcroco/libcroco.SlackBuild b/source/l/libcroco/libcroco.SlackBuild index bd02392c7..25a7652b3 100755 --- a/source/l/libcroco/libcroco.SlackBuild +++ b/source/l/libcroco/libcroco.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/l/libdbusmenu-qt/libdbusmenu-qt.SlackBuild b/source/l/libdbusmenu-qt/libdbusmenu-qt.SlackBuild index 04d87c652..eef0b1722 100755 --- a/source/l/libdbusmenu-qt/libdbusmenu-qt.SlackBuild +++ b/source/l/libdbusmenu-qt/libdbusmenu-qt.SlackBuild @@ -34,7 +34,7 @@ PKGNAM=libdbusmenu-qt VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-3} -NUMJOBS=${NUMJOBS:--j7} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) diff --git a/source/l/libdiscid/libdiscid.SlackBuild b/source/l/libdiscid/libdiscid.SlackBuild index d6c7b9b4a..a9daab56b 100755 --- a/source/l/libdiscid/libdiscid.SlackBuild +++ b/source/l/libdiscid/libdiscid.SlackBuild @@ -50,6 +50,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/l/libdvdnav/libdvdnav.SlackBuild b/source/l/libdvdnav/libdvdnav.SlackBuild index 729772baa..5d6076508 100755 --- a/source/l/libdvdnav/libdvdnav.SlackBuild +++ b/source/l/libdvdnav/libdvdnav.SlackBuild @@ -47,7 +47,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:--j6} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" diff --git a/source/l/libdvdread/libdvdread.SlackBuild b/source/l/libdvdread/libdvdread.SlackBuild index 4fd0204aa..72259ed36 100755 --- a/source/l/libdvdread/libdvdread.SlackBuild +++ b/source/l/libdvdread/libdvdread.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:--j6} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" diff --git a/source/l/libedit/libedit.SlackBuild b/source/l/libedit/libedit.SlackBuild index 2798d9fc7..8d19affee 100755 --- a/source/l/libedit/libedit.SlackBuild +++ b/source/l/libedit/libedit.SlackBuild @@ -30,7 +30,7 @@ VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1-2 - PKGVER=$(echo $VERSION | tr - _) 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/l/libevent/libevent.SlackBuild b/source/l/libevent/libevent.SlackBuild index ad7e00b97..5f591cf6d 100755 --- a/source/l/libevent/libevent.SlackBuild +++ b/source/l/libevent/libevent.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/l/libexif/libexif.SlackBuild b/source/l/libexif/libexif.SlackBuild index 2a9980f74..a6718d7f5 100755 --- a/source/l/libexif/libexif.SlackBuild +++ b/source/l/libexif/libexif.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/l/libglade/libglade.SlackBuild b/source/l/libglade/libglade.SlackBuild index 9b6912a0b..4062ed993 100755 --- a/source/l/libglade/libglade.SlackBuild +++ b/source/l/libglade/libglade.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-libglade diff --git a/source/l/libgnome-keyring/libgnome-keyring.SlackBuild b/source/l/libgnome-keyring/libgnome-keyring.SlackBuild index 6467eff2d..95eed1089 100755 --- a/source/l/libgnome-keyring/libgnome-keyring.SlackBuild +++ b/source/l/libgnome-keyring/libgnome-keyring.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/l/libgphoto2/libgphoto2.SlackBuild b/source/l/libgphoto2/libgphoto2.SlackBuild index b998e7226..43a9b0831 100755 --- a/source/l/libgphoto2/libgphoto2.SlackBuild +++ b/source/l/libgphoto2/libgphoto2.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/l/libgpod/libgpod.SlackBuild b/source/l/libgpod/libgpod.SlackBuild index fb34b23e3..802f3eea0 100755 --- a/source/l/libgpod/libgpod.SlackBuild +++ b/source/l/libgpod/libgpod.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/l/libgsf/libgsf.SlackBuild b/source/l/libgsf/libgsf.SlackBuild index 3ae1c7844..777b68f17 100755 --- a/source/l/libgsf/libgsf.SlackBuild +++ b/source/l/libgsf/libgsf.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=libgsf VERSION=${VERSION:-$(echo libgsf-*.tar.?z* | 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/l/libical/libical.SlackBuild b/source/l/libical/libical.SlackBuild index 9303bd5d7..4543dbf6d 100755 --- a/source/l/libical/libical.SlackBuild +++ b/source/l/libical/libical.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/l/libid3tag/libid3tag.SlackBuild b/source/l/libid3tag/libid3tag.SlackBuild index cae0f93f0..fd89b2548 100755 --- a/source/l/libid3tag/libid3tag.SlackBuild +++ b/source/l/libid3tag/libid3tag.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/l/libidl/libidl.SlackBuild b/source/l/libidl/libidl.SlackBuild index ac4a10a38..c87ae7efa 100755 --- a/source/l/libidl/libidl.SlackBuild +++ b/source/l/libidl/libidl.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-libIDL diff --git a/source/l/libidn/libidn.SlackBuild b/source/l/libidn/libidn.SlackBuild index 0748c86ec..5b4da78fd 100755 --- a/source/l/libidn/libidn.SlackBuild +++ b/source/l/libidn/libidn.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/l/libidn2/libidn2.SlackBuild b/source/l/libidn2/libidn2.SlackBuild index 4c340b8e4..9fa641ebd 100755 --- a/source/l/libidn2/libidn2.SlackBuild +++ b/source/l/libidn2/libidn2.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/l/libieee1284/libieee1284.SlackBuild b/source/l/libieee1284/libieee1284.SlackBuild index 53be6fe8f..8146f9acd 100755 --- a/source/l/libieee1284/libieee1284.SlackBuild +++ b/source/l/libieee1284/libieee1284.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/l/libimobiledevice/libimobiledevice.SlackBuild b/source/l/libimobiledevice/libimobiledevice.SlackBuild index 322f83b57..cb7a0a844 100755 --- a/source/l/libimobiledevice/libimobiledevice.SlackBuild +++ b/source/l/libimobiledevice/libimobiledevice.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/l/libiodbc/libiodbc.SlackBuild b/source/l/libiodbc/libiodbc.SlackBuild index cd9fc3fad..8e2618e60 100755 --- a/source/l/libiodbc/libiodbc.SlackBuild +++ b/source/l/libiodbc/libiodbc.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libiodbc VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-3} -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/l/libjpeg-turbo/libjpeg-turbo.SlackBuild b/source/l/libjpeg-turbo/libjpeg-turbo.SlackBuild index 544edbf76..89065e1af 100755 --- a/source/l/libjpeg-turbo/libjpeg-turbo.SlackBuild +++ b/source/l/libjpeg-turbo/libjpeg-turbo.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/l/libkarma/libkarma.SlackBuild b/source/l/libkarma/libkarma.SlackBuild index faf5e3dd1..be16e6076 100755 --- a/source/l/libkarma/libkarma.SlackBuild +++ b/source/l/libkarma/libkarma.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/l/liblastfm/liblastfm.SlackBuild b/source/l/liblastfm/liblastfm.SlackBuild index ac6336ab5..846019137 100755 --- a/source/l/liblastfm/liblastfm.SlackBuild +++ b/source/l/liblastfm/liblastfm.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM="liblastfm" 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/l/libmad/libmad.SlackBuild b/source/l/libmad/libmad.SlackBuild index ba5e5acab..bb6cb998c 100755 --- a/source/l/libmad/libmad.SlackBuild +++ b/source/l/libmad/libmad.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/l/libmcrypt/libmcrypt.SlackBuild b/source/l/libmcrypt/libmcrypt.SlackBuild index 9aca03281..ec5a1cd36 100755 --- a/source/l/libmcrypt/libmcrypt.SlackBuild +++ b/source/l/libmcrypt/libmcrypt.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/l/libmng/libmng.SlackBuild b/source/l/libmng/libmng.SlackBuild index ae00c7b65..fccee115d 100755 --- a/source/l/libmng/libmng.SlackBuild +++ b/source/l/libmng/libmng.SlackBuild @@ -49,7 +49,7 @@ PKG=$TMP/package-${PKGNAM} rm -rf $PKG mkdir -p $TMP $PKG -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" diff --git a/source/l/libmpc/libmpc.SlackBuild b/source/l/libmpc/libmpc.SlackBuild index 122593922..76fe5793b 100755 --- a/source/l/libmpc/libmpc.SlackBuild +++ b/source/l/libmpc/libmpc.SlackBuild @@ -49,7 +49,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/l/libmtp/libmtp.SlackBuild b/source/l/libmtp/libmtp.SlackBuild index bd2bed02d..0f223327a 100755 --- a/source/l/libmtp/libmtp.SlackBuild +++ b/source/l/libmtp/libmtp.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/l/libnih/libnih.SlackBuild b/source/l/libnih/libnih.SlackBuild index 8ae4b5b16..26a0c1e85 100755 --- a/source/l/libnih/libnih.SlackBuild +++ b/source/l/libnih/libnih.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/l/libnjb/libnjb.SlackBuild b/source/l/libnjb/libnjb.SlackBuild index 05b663088..473ebe0ba 100755 --- a/source/l/libnjb/libnjb.SlackBuild +++ b/source/l/libnjb/libnjb.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/l/libnl/libnl.SlackBuild b/source/l/libnl/libnl.SlackBuild index 672b81ca3..8f91adedf 100755 --- a/source/l/libnl/libnl.SlackBuild +++ b/source/l/libnl/libnl.SlackBuild @@ -50,7 +50,7 @@ fi TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -NUMJOBS=${NUMJOBS:--j6} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" diff --git a/source/l/libnl3/libnl3.SlackBuild b/source/l/libnl3/libnl3.SlackBuild index 4d4b3bb2d..4994a7619 100755 --- a/source/l/libnl3/libnl3.SlackBuild +++ b/source/l/libnl3/libnl3.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-$PKGNAME diff --git a/source/l/libnotify/libnotify.SlackBuild b/source/l/libnotify/libnotify.SlackBuild index 6e0ab7723..98c4d3f64 100755 --- a/source/l/libnotify/libnotify.SlackBuild +++ b/source/l/libnotify/libnotify.SlackBuild @@ -29,7 +29,7 @@ PKGNAM=libnotify 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) "} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/libodfgen/libodfgen.SlackBuild b/source/l/libodfgen/libodfgen.SlackBuild index 24333dab9..18ec4d14c 100755 --- a/source/l/libodfgen/libodfgen.SlackBuild +++ b/source/l/libodfgen/libodfgen.SlackBuild @@ -27,7 +27,7 @@ PKGNAM=libodfgen 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: MARCH=$( uname -m ) diff --git a/source/l/libogg/libogg.SlackBuild b/source/l/libogg/libogg.SlackBuild index 9a6cc30e1..d0d232363 100755 --- a/source/l/libogg/libogg.SlackBuild +++ b/source/l/libogg/libogg.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/l/liboggz/liboggz.SlackBuild b/source/l/liboggz/liboggz.SlackBuild index 1cedfa043..5cf9d4dc1 100755 --- a/source/l/liboggz/liboggz.SlackBuild +++ b/source/l/liboggz/liboggz.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/l/liboil/liboil.SlackBuild b/source/l/liboil/liboil.SlackBuild index 20064cd03..dbe8adb95 100755 --- a/source/l/liboil/liboil.SlackBuild +++ b/source/l/liboil/liboil.SlackBuild @@ -51,7 +51,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/l/libopusenc/libopusenc.SlackBuild b/source/l/libopusenc/libopusenc.SlackBuild new file mode 100755 index 000000000..cdfc16a12 --- /dev/null +++ b/source/l/libopusenc/libopusenc.SlackBuild @@ -0,0 +1,148 @@ +#!/bin/bash + +# Copyright 2017, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=libopusenc +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | rev | cut -f 2- -d -)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +fi + +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$(echo $VERSION | tr '-' '_')-$ARCH-$BUILD.txz" + exit 0 +fi + +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +# Configure: +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --mandir=/usr/man \ + --docdir=/usr/doc/${PKGNAM}-$VERSION \ + --infodir=/usr/info \ + --disable-static \ + --build=$ARCH-slackware-linux || exit 1 + +# Build and install: +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Don't ship .la files: +rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la + +# Strip binaries: +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) + +# Add a documentation directory: +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + AUTHORS COPYING* NEWS README* \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1 | grep -v '\.gz$') ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$(echo $VERSION | tr '-' '_')-$ARCH-$BUILD.txz + diff --git a/source/l/libopusenc/slack-desc b/source/l/libopusenc/slack-desc new file mode 100644 index 000000000..353843502 --- /dev/null +++ b/source/l/libopusenc/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +libopusenc: libopusenc (library for encoding .opus files) +libopusenc: +libopusenc: The libopusenc libraries provide a high-level API for encoding .opus +libopusenc: files. libopusenc depends only on libopus. +libopusenc: +libopusenc: Homepage: https://libopusenc-codec.org/ +libopusenc: +libopusenc: +libopusenc: +libopusenc: +libopusenc: diff --git a/source/l/libpcap/libpcap.SlackBuild b/source/l/libpcap/libpcap.SlackBuild index 16ffe9634..c7739c9df 100755 --- a/source/l/libpcap/libpcap.SlackBuild +++ b/source/l/libpcap/libpcap.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" = "x86_64" ]; then LIBDIRSUFFIX="64" diff --git a/source/l/libplist/libplist.SlackBuild b/source/l/libplist/libplist.SlackBuild index 2d71915d9..d8894611b 100755 --- a/source/l/libplist/libplist.SlackBuild +++ b/source/l/libplist/libplist.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/l/libpng/libpng.SlackBuild b/source/l/libpng/libpng.SlackBuild index e4ec60837..5f7fd7e61 100755 --- a/source/l/libpng/libpng.SlackBuild +++ b/source/l/libpng/libpng.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/l/libproxy/libproxy.SlackBuild b/source/l/libproxy/libproxy.SlackBuild index 9669cfde1..86cf95402 100755 --- a/source/l/libproxy/libproxy.SlackBuild +++ b/source/l/libproxy/libproxy.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/l/libraw1394/libraw1394.SlackBuild b/source/l/libraw1394/libraw1394.SlackBuild index 540992c9b..8c4a7fb6c 100755 --- a/source/l/libraw1394/libraw1394.SlackBuild +++ b/source/l/libraw1394/libraw1394.SlackBuild @@ -47,7 +47,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/l/librevenge/librevenge.SlackBuild b/source/l/librevenge/librevenge.SlackBuild index 23ce54f38..f57a7a40f 100755 --- a/source/l/librevenge/librevenge.SlackBuild +++ b/source/l/librevenge/librevenge.SlackBuild @@ -27,7 +27,7 @@ PKGNAM=librevenge VERSION=${VERSION:-$(echo librevenge-*.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/l/librsvg/librsvg.SlackBuild b/source/l/librsvg/librsvg.SlackBuild index 8e4dd0ad6..480d07efa 100755 --- a/source/l/librsvg/librsvg.SlackBuild +++ b/source/l/librsvg/librsvg.SlackBuild @@ -43,7 +43,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/l/libsecret/libsecret.SlackBuild b/source/l/libsecret/libsecret.SlackBuild index aff1afed7..a3df6378e 100755 --- a/source/l/libsecret/libsecret.SlackBuild +++ b/source/l/libsecret/libsecret.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/l/libsigc++/libsigc++.SlackBuild b/source/l/libsigc++/libsigc++.SlackBuild index e07a21ef1..6737ac81f 100755 --- a/source/l/libsigc++/libsigc++.SlackBuild +++ b/source/l/libsigc++/libsigc++.SlackBuild @@ -42,7 +42,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/l/libsigsegv/libsigsegv.SlackBuild b/source/l/libsigsegv/libsigsegv.SlackBuild index 07640db78..bfe1d4e87 100755 --- a/source/l/libsigsegv/libsigsegv.SlackBuild +++ b/source/l/libsigsegv/libsigsegv.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=libsigsegv 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/l/libsodium/libsodium.SlackBuild b/source/l/libsodium/libsodium.SlackBuild index 642ac8e1a..e98197e90 100755 --- a/source/l/libsodium/libsodium.SlackBuild +++ b/source/l/libsodium/libsodium.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/l/libsoup/libsoup.SlackBuild b/source/l/libsoup/libsoup.SlackBuild index d1d115c55..982dd61e6 100755 --- a/source/l/libsoup/libsoup.SlackBuild +++ b/source/l/libsoup/libsoup.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/l/libspectre/libspectre.SlackBuild b/source/l/libspectre/libspectre.SlackBuild index c723cc2f8..32717010a 100755 --- a/source/l/libspectre/libspectre.SlackBuild +++ b/source/l/libspectre/libspectre.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-$PKGNAM diff --git a/source/l/libssh/libssh.SlackBuild b/source/l/libssh/libssh.SlackBuild index 0a24568ae..75eac5914 100755 --- a/source/l/libssh/libssh.SlackBuild +++ b/source/l/libssh/libssh.SlackBuild @@ -27,7 +27,7 @@ PKGNAM=libssh 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: MARCH=$( uname -m ) diff --git a/source/l/libssh2/libssh2.SlackBuild b/source/l/libssh2/libssh2.SlackBuild index 9ed7e23f8..b3182ac5c 100755 --- a/source/l/libssh2/libssh2.SlackBuild +++ b/source/l/libssh2/libssh2.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/l/libtasn1/libtasn1.SlackBuild b/source/l/libtasn1/libtasn1.SlackBuild index 6cd137054..dd33fc897 100755 --- a/source/l/libtasn1/libtasn1.SlackBuild +++ b/source/l/libtasn1/libtasn1.SlackBuild @@ -43,7 +43,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-$PKGNAM diff --git a/source/l/libtheora/libtheora.SlackBuild b/source/l/libtheora/libtheora.SlackBuild index a3b9ee5db..17798e35e 100755 --- a/source/l/libtheora/libtheora.SlackBuild +++ b/source/l/libtheora/libtheora.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/l/libtiff/libtiff.SlackBuild b/source/l/libtiff/libtiff.SlackBuild index 3bdac49ed..8e2e2b699 100755 --- a/source/l/libtiff/libtiff.SlackBuild +++ b/source/l/libtiff/libtiff.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" = "i386" ]; then SLKCFLAGS="-O2 -march=i386 -mcpu=i686" diff --git a/source/l/libunistring/libunistring.SlackBuild b/source/l/libunistring/libunistring.SlackBuild index 8565e584b..70740fb25 100755 --- a/source/l/libunistring/libunistring.SlackBuild +++ b/source/l/libunistring/libunistring.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/l/libunwind/libunwind.SlackBuild b/source/l/libunwind/libunwind.SlackBuild index 25a055a01..eb247e2f9 100755 --- a/source/l/libunwind/libunwind.SlackBuild +++ b/source/l/libunwind/libunwind.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/l/libusb-compat/libusb-compat.SlackBuild b/source/l/libusb-compat/libusb-compat.SlackBuild index c12791bd0..379e8deb0 100755 --- a/source/l/libusb-compat/libusb-compat.SlackBuild +++ b/source/l/libusb-compat/libusb-compat.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/l/libusb/libusb.SlackBuild b/source/l/libusb/libusb.SlackBuild index 02fd7ca55..2be632013 100755 --- a/source/l/libusb/libusb.SlackBuild +++ b/source/l/libusb/libusb.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=libusb 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) "} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/libusbmuxd/libusbmuxd.SlackBuild b/source/l/libusbmuxd/libusbmuxd.SlackBuild index 21786a0cb..4348e6281 100755 --- a/source/l/libusbmuxd/libusbmuxd.SlackBuild +++ b/source/l/libusbmuxd/libusbmuxd.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/l/libvisio/libvisio.SlackBuild b/source/l/libvisio/libvisio.SlackBuild index abc96f60d..29dcca43a 100755 --- a/source/l/libvisio/libvisio.SlackBuild +++ b/source/l/libvisio/libvisio.SlackBuild @@ -29,7 +29,7 @@ PKGNAM=libvisio 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/l/libvisual-plugins/libvisual-plugins.SlackBuild b/source/l/libvisual-plugins/libvisual-plugins.SlackBuild index c2d911e94..84f6f7f07 100755 --- a/source/l/libvisual-plugins/libvisual-plugins.SlackBuild +++ b/source/l/libvisual-plugins/libvisual-plugins.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/l/libvisual/libvisual.SlackBuild b/source/l/libvisual/libvisual.SlackBuild index 13020d725..a45ee65de 100755 --- a/source/l/libvisual/libvisual.SlackBuild +++ b/source/l/libvisual/libvisual.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/l/libvncserver/libvncserver.SlackBuild b/source/l/libvncserver/libvncserver.SlackBuild index 5ed7f33a8..69a098b88 100755 --- a/source/l/libvncserver/libvncserver.SlackBuild +++ b/source/l/libvncserver/libvncserver.SlackBuild @@ -30,7 +30,7 @@ PKGNAM=libvncserver VERSION=${VERSION:-$(echo LibVNCServer-*.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/l/libvorbis/libvorbis.SlackBuild b/source/l/libvorbis/libvorbis.SlackBuild index a696df217..412a2d408 100755 --- a/source/l/libvorbis/libvorbis.SlackBuild +++ b/source/l/libvorbis/libvorbis.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=libvorbis VERSION=${VERSION:-$(echo libvorbis-*.tar.?z* | 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/l/libvpx/libvpx.SlackBuild b/source/l/libvpx/libvpx.SlackBuild index fc9608ef4..90604d76c 100755 --- a/source/l/libvpx/libvpx.SlackBuild +++ b/source/l/libvpx/libvpx.SlackBuild @@ -45,7 +45,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:--j6} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" diff --git a/source/l/libwebp/libwebp.SlackBuild b/source/l/libwebp/libwebp.SlackBuild index c4d6d7e63..36229d3f8 100755 --- a/source/l/libwebp/libwebp.SlackBuild +++ b/source/l/libwebp/libwebp.SlackBuild @@ -47,7 +47,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/l/libwmf/libwmf.SlackBuild b/source/l/libwmf/libwmf.SlackBuild index 60dde8f4c..ab6934946 100755 --- a/source/l/libwmf/libwmf.SlackBuild +++ b/source/l/libwmf/libwmf.SlackBuild @@ -58,7 +58,7 @@ else LIBDIRSUFFIX="" fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-libwmf diff --git a/source/l/libwnck/libwnck.SlackBuild b/source/l/libwnck/libwnck.SlackBuild index 38d21f185..c83c188c1 100755 --- a/source/l/libwnck/libwnck.SlackBuild +++ b/source/l/libwnck/libwnck.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=libwnck VERSION=${VERSION:-$(echo libwnck-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-3} -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/l/libwpd/libwpd.SlackBuild b/source/l/libwpd/libwpd.SlackBuild index f7bd57d10..492ab2f24 100755 --- a/source/l/libwpd/libwpd.SlackBuild +++ b/source/l/libwpd/libwpd.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=libwpd VERSION=${VERSION:-$(echo libwpd-*.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/l/libwpg/libwpg.SlackBuild b/source/l/libwpg/libwpg.SlackBuild index 10a148ba9..25925df28 100755 --- a/source/l/libwpg/libwpg.SlackBuild +++ b/source/l/libwpg/libwpg.SlackBuild @@ -29,7 +29,7 @@ PKGNAM=libwpg 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: MARCH=$( uname -m ) diff --git a/source/l/libxklavier/libxklavier.SlackBuild b/source/l/libxklavier/libxklavier.SlackBuild index 0b35f351b..54a9334b3 100755 --- a/source/l/libxklavier/libxklavier.SlackBuild +++ b/source/l/libxklavier/libxklavier.SlackBuild @@ -29,7 +29,7 @@ PKGNAM=libxklavier VERSION=${VERSION:-$(echo libxklavier-*.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 architecture for build & packaging: if [ -z "$ARCH" ]; then diff --git a/source/l/libxml2/libxml2.SlackBuild b/source/l/libxml2/libxml2.SlackBuild index 699fb6ef0..08c6b3b49 100755 --- a/source/l/libxml2/libxml2.SlackBuild +++ b/source/l/libxml2/libxml2.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/l/libxslt/libxslt.SlackBuild b/source/l/libxslt/libxslt.SlackBuild index 15785ba5b..13f3cb160 100755 --- a/source/l/libxslt/libxslt.SlackBuild +++ b/source/l/libxslt/libxslt.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/l/libyaml/libyaml.SlackBuild b/source/l/libyaml/libyaml.SlackBuild index 1a8e46c9d..9fb202b60 100755 --- a/source/l/libyaml/libyaml.SlackBuild +++ b/source/l/libyaml/libyaml.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/l/libzip/libzip.SlackBuild b/source/l/libzip/libzip.SlackBuild index 8925a86a4..f271dcda9 100755 --- a/source/l/libzip/libzip.SlackBuild +++ b/source/l/libzip/libzip.SlackBuild @@ -47,7 +47,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-libzip diff --git a/source/l/lmdb/lmdb.SlackBuild b/source/l/lmdb/lmdb.SlackBuild index d71b27054..daefefcc9 100755 --- a/source/l/lmdb/lmdb.SlackBuild +++ b/source/l/lmdb/lmdb.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/l/loudmouth/loudmouth.SlackBuild b/source/l/loudmouth/loudmouth.SlackBuild index f7f46ef00..1ab48c0fb 100755 --- a/source/l/loudmouth/loudmouth.SlackBuild +++ b/source/l/loudmouth/loudmouth.SlackBuild @@ -28,7 +28,7 @@ PKGNAM=loudmouth VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-3} -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/l/lzo/lzo.SlackBuild b/source/l/lzo/lzo.SlackBuild index 7514eab96..5ef8fe26e 100755 --- a/source/l/lzo/lzo.SlackBuild +++ b/source/l/lzo/lzo.SlackBuild @@ -47,7 +47,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/l/mhash/mhash.SlackBuild b/source/l/mhash/mhash.SlackBuild index 0d6038cce..d5ca8c407 100755 --- a/source/l/mhash/mhash.SlackBuild +++ b/source/l/mhash/mhash.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/l/mm/mm.SlackBuild b/source/l/mm/mm.SlackBuild index 9f1c7e7b7..2d8e66f3a 100755 --- a/source/l/mm/mm.SlackBuild +++ b/source/l/mm/mm.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/l/mozilla-nss/mozilla-nss.SlackBuild b/source/l/mozilla-nss/mozilla-nss.SlackBuild index 96a933189..1ae458540 100755 --- a/source/l/mozilla-nss/mozilla-nss.SlackBuild +++ b/source/l/mozilla-nss/mozilla-nss.SlackBuild @@ -69,7 +69,7 @@ TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM # Seems parallel build does not work with this. -#NUMJOBS=${NUMJOBS:-" -j7 "} +#NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} rm -rf $PKG mkdir -p $TMP $PKG diff --git a/source/l/mpfr/mpfr.SlackBuild b/source/l/mpfr/mpfr.SlackBuild index 98e068a82..7da56c204 100755 --- a/source/l/mpfr/mpfr.SlackBuild +++ b/source/l/mpfr/mpfr.SlackBuild @@ -28,7 +28,7 @@ PKGNAM=mpfr VERSION=${VERSION:-$(echo mpfr-*.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/l/ncurses/ncurses.SlackBuild b/source/l/ncurses/ncurses.SlackBuild index 1aedb9ab9..7c6542a34 100755 --- a/source/l/ncurses/ncurses.SlackBuild +++ b/source/l/ncurses/ncurses.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-ncurses diff --git a/source/l/neon/neon.SlackBuild b/source/l/neon/neon.SlackBuild index da5e2fa75..02f70e34b 100755 --- a/source/l/neon/neon.SlackBuild +++ b/source/l/neon/neon.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/l/newt/newt.SlackBuild b/source/l/newt/newt.SlackBuild index 4cc104484..e3c584708 100755 --- a/source/l/newt/newt.SlackBuild +++ b/source/l/newt/newt.SlackBuild @@ -62,7 +62,7 @@ else LIBDIRSUFFIX="" fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} PYTHONLIB=$( python -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' ) PYTHON3LIB=$( python3 -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' ) diff --git a/source/l/ocl-icd/ocl-icd.SlackBuild b/source/l/ocl-icd/ocl-icd.SlackBuild index 2989e0e43..1d87e5947 100755 --- a/source/l/ocl-icd/ocl-icd.SlackBuild +++ b/source/l/ocl-icd/ocl-icd.SlackBuild @@ -29,7 +29,7 @@ PKGNAM=ocl-icd 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: MARCH=$( uname -m ) diff --git a/source/l/openexr/openexr.SlackBuild b/source/l/openexr/openexr.SlackBuild index 0610c1a6c..a64a26cd1 100755 --- a/source/l/openexr/openexr.SlackBuild +++ b/source/l/openexr/openexr.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/l/openjpeg/openjpeg.SlackBuild b/source/l/openjpeg/openjpeg.SlackBuild index d9a23fd18..054a1d334 100755 --- a/source/l/openjpeg/openjpeg.SlackBuild +++ b/source/l/openjpeg/openjpeg.SlackBuild @@ -29,7 +29,7 @@ PKGNAM=openjpeg 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: MARCH=$( uname -m ) diff --git a/source/l/opus/opus.SlackBuild b/source/l/opus/opus.SlackBuild index c2274fc80..1d6033771 100755 --- a/source/l/opus/opus.SlackBuild +++ b/source/l/opus/opus.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/l/opusfile/opusfile.SlackBuild b/source/l/opusfile/opusfile.SlackBuild index fcfa04c4d..b180340bc 100755 --- a/source/l/opusfile/opusfile.SlackBuild +++ b/source/l/opusfile/opusfile.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=opusfile VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | rev | cut -f 2- -d -)} -BUILD=${BUILD:-4} +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/l/orc/orc.SlackBuild b/source/l/orc/orc.SlackBuild index 454210083..40954638d 100755 --- a/source/l/orc/orc.SlackBuild +++ b/source/l/orc/orc.SlackBuild @@ -27,7 +27,7 @@ PKGNAM=orc 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) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/l/pango/pango.SlackBuild b/source/l/pango/pango.SlackBuild index 86e3405cb..dfc6547d7 100755 --- a/source/l/pango/pango.SlackBuild +++ b/source/l/pango/pango.SlackBuild @@ -58,7 +58,7 @@ else LIBDIRSUFFIX="" fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-pango diff --git a/source/l/pangomm/pangomm.SlackBuild b/source/l/pangomm/pangomm.SlackBuild index 9357d1b5d..c73a99d55 100755 --- a/source/l/pangomm/pangomm.SlackBuild +++ b/source/l/pangomm/pangomm.SlackBuild @@ -42,7 +42,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/l/parted/parted.SlackBuild b/source/l/parted/parted.SlackBuild index ecbdafe58..3cdb3633b 100755 --- a/source/l/parted/parted.SlackBuild +++ b/source/l/parted/parted.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=parted 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 @@ -74,6 +74,7 @@ tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1 cd ${PKGNAM}-$VERSION || exit 1 zcat $CWD/parted.configure.diff.gz | patch -p1 || exit 1 +zcat $CWD/parted.glibc228.diff.gz | patch -p1 || exit 1 # Make sure ownerships and permissions are sane: chown -R root:root . diff --git a/source/l/parted/parted.SlackBuild.static b/source/l/parted/parted.SlackBuild.static index eca8f1653..b695d6c06 100755 --- a/source/l/parted/parted.SlackBuild.static +++ b/source/l/parted/parted.SlackBuild.static @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,12 +20,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) PKGNAM=parted VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -37,7 +38,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} @@ -55,14 +63,18 @@ else LIBDIRSUFFIX="" fi +# Don't use icecream: +PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g") + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf ${PKGNAM}-${VERSION} tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1 -cd ${PKGNAM}-$VERSION +cd ${PKGNAM}-$VERSION || exit 1 zcat $CWD/parted.configure.diff.gz | patch -p1 || exit 1 +zcat $CWD/parted.glibc228.diff.gz | patch -p1 || exit 1 # Make sure ownerships and permissions are sane: chown -R root:root . @@ -82,10 +94,13 @@ CFLAGS="$SLKCFLAGS" \ --enable-static=yes \ --enable-device-mapper=yes \ --with-readline \ - --build=$ARCH-slackware-linux + --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG +make install DESTDIR=$PKG || exit 1 + +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la # Strip binaries: ( cd $PKG diff --git a/source/l/parted/parted.glibc228.diff b/source/l/parted/parted.glibc228.diff new file mode 100644 index 000000000..db33798b0 --- /dev/null +++ b/source/l/parted/parted.glibc228.diff @@ -0,0 +1,10 @@ +--- ./libparted/architecture.h.orig 2014-06-15 13:17:43.000000000 -0500 ++++ ./libparted/architecture.h 2018-09-18 18:55:41.959066415 -0500 +@@ -24,6 +24,7 @@ + #define _LIBPARTED_ARCH_H_INCLUDED + + #include <parted/disk.h> ++#include <sys/sysmacros.h> + + struct _PedArchitecture { + PedDiskArchOps* disk_ops; diff --git a/source/l/pcre/pcre.SlackBuild b/source/l/pcre/pcre.SlackBuild index c2fb659ee..181c8cc9d 100755 --- a/source/l/pcre/pcre.SlackBuild +++ b/source/l/pcre/pcre.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/l/pcre2/pcre2.SlackBuild b/source/l/pcre2/pcre2.SlackBuild index 0b38406bc..e735d9584 100755 --- a/source/l/pcre2/pcre2.SlackBuild +++ b/source/l/pcre2/pcre2.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/l/phonon-gstreamer/phonon-gstreamer.SlackBuild b/source/l/phonon-gstreamer/phonon-gstreamer.SlackBuild index 6655ad2b8..4aa86b36e 100755 --- a/source/l/phonon-gstreamer/phonon-gstreamer.SlackBuild +++ b/source/l/phonon-gstreamer/phonon-gstreamer.SlackBuild @@ -29,7 +29,7 @@ SRCNAM=phonon-backend-gstreamer 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/l/phonon/phonon.SlackBuild b/source/l/phonon/phonon.SlackBuild index 7d31d9d9f..66fdae2bb 100755 --- a/source/l/phonon/phonon.SlackBuild +++ b/source/l/phonon/phonon.SlackBuild @@ -29,7 +29,7 @@ PKGNAM=phonon VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-3} -NUMJOBS=${NUMJOBS:--j7} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) diff --git a/source/l/pilot-link/pilot-link.SlackBuild b/source/l/pilot-link/pilot-link.SlackBuild index 73277c089..5d610f28a 100755 --- a/source/l/pilot-link/pilot-link.SlackBuild +++ b/source/l/pilot-link/pilot-link.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-pilot-link diff --git a/source/l/polkit-gnome/polkit-gnome.SlackBuild b/source/l/polkit-gnome/polkit-gnome.SlackBuild index 7fdb5f9dd..c1a3989ea 100755 --- a/source/l/polkit-gnome/polkit-gnome.SlackBuild +++ b/source/l/polkit-gnome/polkit-gnome.SlackBuild @@ -46,7 +46,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-$PKGNAM diff --git a/source/l/polkit-qt-1/polkit-qt-1.SlackBuild b/source/l/polkit-qt-1/polkit-qt-1.SlackBuild index 067d74915..42eed934c 100755 --- a/source/l/polkit-qt-1/polkit-qt-1.SlackBuild +++ b/source/l/polkit-qt-1/polkit-qt-1.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=polkit-qt-1 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: MARCH=$( uname -m ) diff --git a/source/l/polkit/polkit.SlackBuild b/source/l/polkit/polkit.SlackBuild index 2d0e92457..372a5d602 100755 --- a/source/l/polkit/polkit.SlackBuild +++ b/source/l/polkit/polkit.SlackBuild @@ -46,7 +46,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-$PKGNAM diff --git a/source/l/poppler/poppler.SlackBuild b/source/l/poppler/poppler.SlackBuild index 1a7481565..11677daca 100755 --- a/source/l/poppler/poppler.SlackBuild +++ b/source/l/poppler/poppler.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/l/popt/popt.SlackBuild b/source/l/popt/popt.SlackBuild index 30cf3c762..d4d0f1c4b 100755 --- a/source/l/popt/popt.SlackBuild +++ b/source/l/popt/popt.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=popt VERSION=${VERSION:-1.16} 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/l/pulseaudio/pulseaudio.SlackBuild b/source/l/pulseaudio/pulseaudio.SlackBuild index d673783c4..b539e2afb 100755 --- a/source/l/pulseaudio/pulseaudio.SlackBuild +++ b/source/l/pulseaudio/pulseaudio.SlackBuild @@ -62,7 +62,7 @@ else LIBDIRSUFFIX="" fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} rm -rf $PKG mkdir -p $TMP $PKG diff --git a/source/l/pycairo/pycairo.SlackBuild b/source/l/pycairo/pycairo.SlackBuild index 02d7aec1d..137d16be5 100755 --- a/source/l/pycairo/pycairo.SlackBuild +++ b/source/l/pycairo/pycairo.SlackBuild @@ -29,7 +29,7 @@ PKGNAM=pycairo 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) "} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/pycups/pycups.SlackBuild b/source/l/pycups/pycups.SlackBuild index f122e2547..6afdabd1b 100755 --- a/source/l/pycups/pycups.SlackBuild +++ b/source/l/pycups/pycups.SlackBuild @@ -47,7 +47,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-$PKGNAM diff --git a/source/l/pycurl/pycurl.SlackBuild b/source/l/pycurl/pycurl.SlackBuild index 032bac66f..b0c220eb1 100755 --- a/source/l/pycurl/pycurl.SlackBuild +++ b/source/l/pycurl/pycurl.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-$PKGNAM diff --git a/source/l/pygobject/pygobject.SlackBuild b/source/l/pygobject/pygobject.SlackBuild index 054b1d72e..b5123d8ab 100755 --- a/source/l/pygobject/pygobject.SlackBuild +++ b/source/l/pygobject/pygobject.SlackBuild @@ -27,7 +27,7 @@ PKGNAM=pygobject 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) "} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/pygobject3/pygobject3.SlackBuild b/source/l/pygobject3/pygobject3.SlackBuild index ad3e05256..4f71ef356 100755 --- a/source/l/pygobject3/pygobject3.SlackBuild +++ b/source/l/pygobject3/pygobject3.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/l/pygtk/pygtk.SlackBuild b/source/l/pygtk/pygtk.SlackBuild index 81b535f7f..66ec1e390 100755 --- a/source/l/pygtk/pygtk.SlackBuild +++ b/source/l/pygtk/pygtk.SlackBuild @@ -27,7 +27,7 @@ PKGNAM=pygtk VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-5} -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/l/qca/qca.SlackBuild b/source/l/qca/qca.SlackBuild index d40821b66..19ac044aa 100755 --- a/source/l/qca/qca.SlackBuild +++ b/source/l/qca/qca.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=qca VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-3} -NUMJOBS=${NUMJOBS:--j6} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine architecture for build & packaging: if [ -z "$ARCH" ]; then diff --git a/source/l/qimageblitz/qimageblitz.SlackBuild b/source/l/qimageblitz/qimageblitz.SlackBuild index c514d4f73..cb127b397 100755 --- a/source/l/qimageblitz/qimageblitz.SlackBuild +++ b/source/l/qimageblitz/qimageblitz.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=qimageblitz VERSION=0.0.6 BUILD=${BUILD:-2} -NUMJOBS=${NUMJOBS:--j6} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-qimageblitz diff --git a/source/l/qjson/qjson.SlackBuild b/source/l/qjson/qjson.SlackBuild index 7a016e998..a44dab651 100755 --- a/source/l/qjson/qjson.SlackBuild +++ b/source/l/qjson/qjson.SlackBuild @@ -27,7 +27,7 @@ PKGNAM=qjson VERSION=${VERSION:-0.8.1} 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/l/qt-gstreamer/qt-gstreamer.SlackBuild b/source/l/qt-gstreamer/qt-gstreamer.SlackBuild index c696b6a79..62e44c4f5 100755 --- a/source/l/qt-gstreamer/qt-gstreamer.SlackBuild +++ b/source/l/qt-gstreamer/qt-gstreamer.SlackBuild @@ -27,7 +27,7 @@ PKGNAM=qt-gstreamer VERSION=${VERSION:-1.2.0} 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/l/qt/qt-nowebkit.SlackBuild b/source/l/qt/qt-nowebkit.SlackBuild index 8637d20e6..3e63c6a57 100755 --- a/source/l/qt/qt-nowebkit.SlackBuild +++ b/source/l/qt/qt-nowebkit.SlackBuild @@ -45,7 +45,7 @@ PKGNAM=qt VERSION=$(ls qt-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev) BUILD=${BUILD:-10} -NUMJOBS=${NUMJOBS:--j7} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) diff --git a/source/l/qtscriptgenerator/qtscriptgenerator.SlackBuild b/source/l/qtscriptgenerator/qtscriptgenerator.SlackBuild index 1b408c0a4..cbb6b2716 100755 --- a/source/l/qtscriptgenerator/qtscriptgenerator.SlackBuild +++ b/source/l/qtscriptgenerator/qtscriptgenerator.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/l/raptor2/raptor2.SlackBuild b/source/l/raptor2/raptor2.SlackBuild index b86d980a6..d33aa5f1e 100755 --- a/source/l/raptor2/raptor2.SlackBuild +++ b/source/l/raptor2/raptor2.SlackBuild @@ -31,7 +31,7 @@ PKGNAM=raptor2 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-5} -NUMJOBS=${NUMJOBS:--j7} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) diff --git a/source/l/rasqal/rasqal.SlackBuild b/source/l/rasqal/rasqal.SlackBuild index 6ede143c2..1ef85f431 100755 --- a/source/l/rasqal/rasqal.SlackBuild +++ b/source/l/rasqal/rasqal.SlackBuild @@ -31,7 +31,7 @@ PKGNAM=rasqal VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-3} -NUMJOBS=${NUMJOBS:--j7} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) diff --git a/source/l/readline/readline.SlackBuild b/source/l/readline/readline.SlackBuild index 776482ab2..d31a78f4f 100755 --- a/source/l/readline/readline.SlackBuild +++ b/source/l/readline/readline.SlackBuild @@ -36,7 +36,7 @@ if [ -z "$ARCH" ]; then esac fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-readline diff --git a/source/l/redland/redland.SlackBuild b/source/l/redland/redland.SlackBuild index a0d70158c..94ea4493d 100755 --- a/source/l/redland/redland.SlackBuild +++ b/source/l/redland/redland.SlackBuild @@ -31,7 +31,7 @@ PKGNAM=redland VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-5} -NUMJOBS=${NUMJOBS:--j7} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) diff --git a/source/l/sbc/sbc.SlackBuild b/source/l/sbc/sbc.SlackBuild index df17b4b21..108bb22ad 100755 --- a/source/l/sbc/sbc.SlackBuild +++ b/source/l/sbc/sbc.SlackBuild @@ -28,7 +28,7 @@ PKGNAM=sbc 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/l/sdl/sdl.SlackBuild b/source/l/sdl/sdl.SlackBuild index 9f886303f..8ec5528fe 100755 --- a/source/l/sdl/sdl.SlackBuild +++ b/source/l/sdl/sdl.SlackBuild @@ -49,7 +49,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/l/serf/serf.SlackBuild b/source/l/serf/serf.SlackBuild index e79ca53b1..4ec42930d 100755 --- a/source/l/serf/serf.SlackBuild +++ b/source/l/serf/serf.SlackBuild @@ -47,7 +47,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-serf diff --git a/source/l/sg3_utils/sg3_utils.SlackBuild b/source/l/sg3_utils/sg3_utils.SlackBuild index 09d391b41..f050f7b18 100755 --- a/source/l/sg3_utils/sg3_utils.SlackBuild +++ b/source/l/sg3_utils/sg3_utils.SlackBuild @@ -29,7 +29,7 @@ PKGNAM=sg3_utils VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | 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: MARCH=$( uname -m ) diff --git a/source/l/shared-desktop-ontologies/shared-desktop-ontologies.SlackBuild b/source/l/shared-desktop-ontologies/shared-desktop-ontologies.SlackBuild index 8f196aae5..d6dffbd67 100755 --- a/source/l/shared-desktop-ontologies/shared-desktop-ontologies.SlackBuild +++ b/source/l/shared-desktop-ontologies/shared-desktop-ontologies.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=shared-desktop-ontologies 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: MARCH=$( uname -m ) diff --git a/source/l/shared-mime-info/shared-mime-info.SlackBuild b/source/l/shared-mime-info/shared-mime-info.SlackBuild index 2157d91f6..9def91323 100755 --- a/source/l/shared-mime-info/shared-mime-info.SlackBuild +++ b/source/l/shared-mime-info/shared-mime-info.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=shared-mime-info 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/l/sip/sip.SlackBuild b/source/l/sip/sip.SlackBuild index c62362f63..0e553bee2 100755 --- a/source/l/sip/sip.SlackBuild +++ b/source/l/sip/sip.SlackBuild @@ -30,7 +30,7 @@ PKGNAM=sip 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: MARCH=$( uname -m ) diff --git a/source/l/slang/slang.SlackBuild b/source/l/slang/slang.SlackBuild index 2f7b90763..6ee1aa36f 100755 --- a/source/l/slang/slang.SlackBuild +++ b/source/l/slang/slang.SlackBuild @@ -45,7 +45,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then fi # This doesn't handle multiple jobs well -NUMJOBS=${NUMJOBS:-" -j1 "} +NUMJOBS=" -j1 " # -fno-tree-dse is needed avoid optimization bugs diff --git a/source/l/slang1/slang1.SlackBuild b/source/l/slang1/slang1.SlackBuild index 1344fd393..b16bc39e1 100755 --- a/source/l/slang1/slang1.SlackBuild +++ b/source/l/slang1/slang1.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/l/soprano/soprano.SlackBuild b/source/l/soprano/soprano.SlackBuild index 4594d3c46..73a6a3b0d 100755 --- a/source/l/soprano/soprano.SlackBuild +++ b/source/l/soprano/soprano.SlackBuild @@ -27,9 +27,9 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=soprano VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} -NUMJOBS=${NUMJOBS:--j7} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) diff --git a/source/l/speex/speex.SlackBuild b/source/l/speex/speex.SlackBuild index 63d72adf6..00ccbb8d8 100755 --- a/source/l/speex/speex.SlackBuild +++ b/source/l/speex/speex.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/l/speexdsp/speexdsp.SlackBuild b/source/l/speexdsp/speexdsp.SlackBuild index 84f85f916..1e5e1ce68 100755 --- a/source/l/speexdsp/speexdsp.SlackBuild +++ b/source/l/speexdsp/speexdsp.SlackBuild @@ -28,7 +28,7 @@ PKGNAM=speexdsp 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) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/l/startup-notification/startup-notification.SlackBuild b/source/l/startup-notification/startup-notification.SlackBuild index e9f0eec88..35fd981f2 100755 --- a/source/l/startup-notification/startup-notification.SlackBuild +++ b/source/l/startup-notification/startup-notification.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=startup-notification VERSION=${VERSION:-$(echo startup-notification-*.tar.?z* | cut -d - -f 3 | rev | cut -f 3- -d . | rev)} BUILD=${BUILD:-3} -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/l/strigi/strigi.SlackBuild b/source/l/strigi/strigi.SlackBuild index 74824e2f9..5a9528552 100755 --- a/source/l/strigi/strigi.SlackBuild +++ b/source/l/strigi/strigi.SlackBuild @@ -29,7 +29,7 @@ PKGNAM=strigi VERSION=${VERSION:-0.7.8} 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/l/system-config-printer/system-config-printer.SlackBuild b/source/l/system-config-printer/system-config-printer.SlackBuild index 794a1c4bf..0d2b1510f 100755 --- a/source/l/system-config-printer/system-config-printer.SlackBuild +++ b/source/l/system-config-printer/system-config-printer.SlackBuild @@ -29,7 +29,7 @@ PKGNAM=system-config-printer VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-3} -NUMJOBS=${NUMJOBS:" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) diff --git a/source/l/t1lib/t1lib.SlackBuild b/source/l/t1lib/t1lib.SlackBuild index 8115f453b..0bdf1f062 100755 --- a/source/l/t1lib/t1lib.SlackBuild +++ b/source/l/t1lib/t1lib.SlackBuild @@ -55,7 +55,7 @@ elif [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-t1lib diff --git a/source/l/taglib-extras/taglib-extras.SlackBuild b/source/l/taglib-extras/taglib-extras.SlackBuild index 8ba6ed46e..c3257e021 100755 --- a/source/l/taglib-extras/taglib-extras.SlackBuild +++ b/source/l/taglib-extras/taglib-extras.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/l/taglib/taglib.SlackBuild b/source/l/taglib/taglib.SlackBuild index 94e93a0c2..a33ecc798 100755 --- a/source/l/taglib/taglib.SlackBuild +++ b/source/l/taglib/taglib.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/l/talloc/talloc.SlackBuild b/source/l/talloc/talloc.SlackBuild index aeab90c74..b642658f6 100755 --- a/source/l/talloc/talloc.SlackBuild +++ b/source/l/talloc/talloc.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/l/tango-icon-theme-extras/tango-icon-theme-extras.SlackBuild b/source/l/tango-icon-theme-extras/tango-icon-theme-extras.SlackBuild index c08c944cd..f46b0f866 100755 --- a/source/l/tango-icon-theme-extras/tango-icon-theme-extras.SlackBuild +++ b/source/l/tango-icon-theme-extras/tango-icon-theme-extras.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=tango-icon-theme-extras VERSION=0.1.0 ARCH=${ARCH:-noarch} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} BUILD=${BUILD:-2} TMP=${TMP:-/tmp} diff --git a/source/l/tdb/tdb.SlackBuild b/source/l/tdb/tdb.SlackBuild index f60cd4cbe..f101edb95 100755 --- a/source/l/tdb/tdb.SlackBuild +++ b/source/l/tdb/tdb.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/l/tevent/tevent.SlackBuild b/source/l/tevent/tevent.SlackBuild index c79a9741a..fded1d7a6 100755 --- a/source/l/tevent/tevent.SlackBuild +++ b/source/l/tevent/tevent.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/l/utf8proc/utf8proc.SlackBuild b/source/l/utf8proc/utf8proc.SlackBuild index ae2110291..342a1db25 100755 --- a/source/l/utf8proc/utf8proc.SlackBuild +++ b/source/l/utf8proc/utf8proc.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/l/v4l-utils/v4l-utils.SlackBuild b/source/l/v4l-utils/v4l-utils.SlackBuild index 936732617..5a21c7203 100755 --- a/source/l/v4l-utils/v4l-utils.SlackBuild +++ b/source/l/v4l-utils/v4l-utils.SlackBuild @@ -27,7 +27,7 @@ PKGNAM=v4l-utils 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 @@ -71,6 +71,8 @@ rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 +zcat $CWD/v4l-utils.glibc228.diff.gz | patch -p1 --verbose || exit 1 + # Make sure ownerships and permissions are sane: chown -R root:root . find . \ diff --git a/source/l/v4l-utils/v4l-utils.glibc228.diff b/source/l/v4l-utils/v4l-utils.glibc228.diff new file mode 100644 index 000000000..d072af747 --- /dev/null +++ b/source/l/v4l-utils/v4l-utils.glibc228.diff @@ -0,0 +1,32 @@ +--- ./lib/libv4lconvert/control/libv4lcontrol.c.orig 2017-12-27 08:33:07.000000000 -0600 ++++ ./lib/libv4lconvert/control/libv4lcontrol.c 2018-09-18 19:07:39.598074096 -0500 +@@ -20,9 +20,7 @@ + */ + + #include <sys/types.h> +-#if defined(MAJOR_IN_SYSMACROS) + #include <sys/sysmacros.h> +-#endif + #include <sys/mman.h> + #include <fcntl.h> + #include <sys/stat.h> +--- ./lib/libv4l2/libv4l2.c.orig 2017-12-27 07:50:55.000000000 -0600 ++++ ./lib/libv4l2/libv4l2.c 2018-09-18 19:07:39.596074096 -0500 +@@ -70,6 +70,7 @@ + #include <sys/types.h> + #include <sys/mman.h> + #include <sys/stat.h> ++#include <sys/sysmacros.h> + #include "libv4l2.h" + #include "libv4l2-priv.h" + #include "libv4l-plugin.h" +--- ./utils/v4l2-ctl/v4l2-ctl.cpp.orig 2017-12-27 07:50:55.000000000 -0600 ++++ ./utils/v4l2-ctl/v4l2-ctl.cpp 2018-09-18 19:07:39.599074096 -0500 +@@ -33,6 +33,7 @@ + #include <errno.h> + #include <sys/ioctl.h> + #include <sys/time.h> ++#include <sys/sysmacros.h> + #include <dirent.h> + #include <math.h> + diff --git a/source/l/virtuoso-ose/doinst.sh b/source/l/virtuoso-ose/doinst.sh deleted file mode 100644 index beafd37c5..000000000 --- a/source/l/virtuoso-ose/doinst.sh +++ /dev/null @@ -1,15 +0,0 @@ -config() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - # If there's no config file by that name, mv it over: - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then - # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} - -config etc/virtuoso.ini.new - diff --git a/source/l/virtuoso-ose/slack-desc b/source/l/virtuoso-ose/slack-desc deleted file mode 100644 index 87d1732bd..000000000 --- a/source/l/virtuoso-ose/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler-----------------------------------------------------| -virtuoso-ose: virtuoso-ose (A high-performance object-relational SQL database) -virtuoso-ose: -virtuoso-ose: Virtuoso is a scalable cross-platform server that combines -virtuoso-ose: SQL/RDF/XML Data Management with Web Application Server -virtuoso-ose: and Web Services Platform functionality. -virtuoso-ose: -virtuoso-ose: -virtuoso-ose: -virtuoso-ose: -virtuoso-ose: Homepage: http://virtuoso.openlinksw.com/wiki/main/ -virtuoso-ose: diff --git a/source/l/virtuoso-ose/virtuoso-ose.SlackBuild b/source/l/virtuoso-ose/virtuoso-ose.SlackBuild deleted file mode 100755 index b7c6b9883..000000000 --- a/source/l/virtuoso-ose/virtuoso-ose.SlackBuild +++ /dev/null @@ -1,130 +0,0 @@ -#!/bin/bash - -# Copyright 2009, 2010, 2011, 2012 Eric Hameleers, Eindhoven, NL -# Copyright 2009, 2010, 2011, 2012, 2018 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. - -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PKGNAM=virtuoso-opensource -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-9} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i586 ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "virtuoso-ose-$VERSION-$ARCH-$BUILD.txz" - exit 0 -fi - -NUMJOBS=${NUMJOBS:--j7} - -TMP=${TMP:-/tmp} -PKG=$TMP/package-virtuoso-ose - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf virtuoso-opensource-$VERSION -tar xvf $CWD/virtuoso-opensource-$VERSION.tar.xz || exit 1 -cd virtuoso-opensource-$VERSION || exit 1 - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# Configure: -# We disable building of all VADs because Slackware's version of Virtuoso is -# only used as backend for the Soprano/Nepomuk desktop search. -# This saves us a lot of megabytes. -CFLAGS="$SLKCFLAGS -I/usr/include/openssl-1.0" \ -CXXFLAGS="$SLKCFLAGS -I/usr/include/openssl-1.0" \ -LIBS="-L/usr/lib${LIBDIRSUFFIX}/openssl-1.0" \ -LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/virtuoso-ose-$VERSION \ - --with-pthreads \ - --enable-aio \ - --disable-static \ - --disable-all-vads \ - --program-prefix= \ - --program-suffix= \ - --build=$ARCH-slackware-linux || exit 1 - -# Build and install: -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -# Do not clobber an existing .ini file: -mkdir -p $PKG/etc -mv $PKG/var/lib/virtuoso/db/virtuoso.ini $PKG/etc/virtuoso.ini.new -ln -sf /etc/virtuoso.ini $PKG/var/lib/virtuoso/db/ - -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -mkdir -p $PKG/usr/doc/virtuoso-ose-$VERSION -cp -a \ - AUTHORS COPYING* CREDITS LICENSE NEWS README* \ - $PKG/usr/doc/virtuoso-ose-$VERSION - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $TMP/virtuoso-ose-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/l/vte/vte.SlackBuild b/source/l/vte/vte.SlackBuild index 3d77a8e8e..9675980e6 100755 --- a/source/l/vte/vte.SlackBuild +++ b/source/l/vte/vte.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=vte VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | 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/l/wavpack/wavpack.SlackBuild b/source/l/wavpack/wavpack.SlackBuild index ab3e0b1c2..003c3be9f 100755 --- a/source/l/wavpack/wavpack.SlackBuild +++ b/source/l/wavpack/wavpack.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/l/xapian-core/xapian-core.SlackBuild b/source/l/xapian-core/xapian-core.SlackBuild index b461bf624..fd2c7d7d7 100755 --- a/source/l/xapian-core/xapian-core.SlackBuild +++ b/source/l/xapian-core/xapian-core.SlackBuild @@ -27,7 +27,7 @@ PKGNAM=xapian-core 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: MARCH=$( uname -m ) diff --git a/source/l/zstd/zstd.SlackBuild b/source/l/zstd/zstd.SlackBuild index 94a2388b9..186ccacd4 100755 --- a/source/l/zstd/zstd.SlackBuild +++ b/source/l/zstd/zstd.SlackBuild @@ -2,32 +2,31 @@ # Copyright 2018 Eric Hameleers, Eindhoven, Netherlands # Copyright 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. + +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: # -# Permission to use, copy, modify, and distribute this software for -# any purpose with or without fee is hereby granted, provided that -# the above copyright notice and this permission notice appear in all -# copies. +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. # -# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# ----------------------------------------------------------------------------- - +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) PKGNAM=zstd VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | 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 @@ -74,9 +73,8 @@ else LIBDIRSUFFIX="" fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM |