summaryrefslogtreecommitdiffstats
path: root/source/d
diff options
context:
space:
mode:
Diffstat (limited to 'source/d')
-rwxr-xr-xsource/d/autoconf/autoconf.SlackBuild2
-rwxr-xr-xsource/d/automake/automake.SlackBuild2
-rwxr-xr-xsource/d/binutils/binutils.SlackBuild2
-rwxr-xr-xsource/d/bison/bison.SlackBuild2
-rwxr-xr-xsource/d/ccache/ccache.SlackBuild2
-rwxr-xr-xsource/d/clisp/clisp.SlackBuild2
-rwxr-xr-xsource/d/cmake/cmake.SlackBuild2
-rwxr-xr-xsource/d/cscope/cscope.SlackBuild2
-rwxr-xr-xsource/d/cvs/cvs.SlackBuild2
-rwxr-xr-xsource/d/distcc/distcc.SlackBuild2
-rwxr-xr-xsource/d/doxygen/doxygen.SlackBuild2
-rwxr-xr-xsource/d/flex/flex.SlackBuild2
-rwxr-xr-xsource/d/gcc/gcc.SlackBuild2
-rwxr-xr-xsource/d/gdb/gdb.SlackBuild2
-rwxr-xr-xsource/d/git/git.SlackBuild2
-rwxr-xr-xsource/d/gnucobol/gnucobol.SlackBuild2
-rwxr-xr-xsource/d/gperf/gperf.SlackBuild2
-rwxr-xr-xsource/d/guile/guile.SlackBuild2
-rwxr-xr-xsource/d/help2man/help2man.SlackBuild2
-rwxr-xr-xsource/d/icecream/get-icecream.sh47
-rwxr-xr-xsource/d/icecream/icecream.SlackBuild2
-rw-r--r--source/d/icecream/rc.icecc-scheduler4
-rw-r--r--source/d/icecream/rc.iceccd4
-rw-r--r--source/d/icecream/rc.icecream.conf17
-rwxr-xr-xsource/d/indent/indent.SlackBuild2
-rwxr-xr-xsource/d/intltool/intltool.SlackBuild2
-rwxr-xr-xsource/d/libtool/libtool.SlackBuild2
-rw-r--r--source/d/llvm/clang-tools-extra.no.clangd.diff20
-rw-r--r--source/d/llvm/clang.toolchains.i586.triple.diff13
-rwxr-xr-xsource/d/llvm/llvm.SlackBuild50
-rw-r--r--source/d/llvm/llvm.url16
-rwxr-xr-xsource/d/m4/m4.SlackBuild5
-rw-r--r--source/d/m4/m4.glibc228.diff108
-rwxr-xr-xsource/d/make/make.SlackBuild2
-rwxr-xr-xsource/d/ninja/ninja.SlackBuild2
-rwxr-xr-xsource/d/opencl-headers/opencl-headers.SlackBuild2
-rwxr-xr-xsource/d/oprofile/oprofile.SlackBuild2
-rwxr-xr-xsource/d/p2c/p2c.SlackBuild2
-rwxr-xr-xsource/d/parallel/parallel.SlackBuild2
-rwxr-xr-xsource/d/patchelf/patchelf.SlackBuild2
-rwxr-xr-xsource/d/perl/perl.SlackBuild2
-rwxr-xr-xsource/d/pkg-config/pkg-config.SlackBuild2
-rwxr-xr-xsource/d/python/python.SlackBuild2
-rwxr-xr-xsource/d/python3/python3.SlackBuild2
-rwxr-xr-xsource/d/rcs/rcs.SlackBuild2
-rwxr-xr-xsource/d/re2c/re2c.SlackBuild2
-rwxr-xr-xsource/d/ruby/ruby.SlackBuild2
-rwxr-xr-xsource/d/rust/rust.SlackBuild2
-rwxr-xr-xsource/d/strace/strace.SlackBuild2
-rwxr-xr-xsource/d/subversion/subversion.SlackBuild2
-rwxr-xr-xsource/d/swig/swig.SlackBuild2
51 files changed, 296 insertions, 70 deletions
diff --git a/source/d/autoconf/autoconf.SlackBuild b/source/d/autoconf/autoconf.SlackBuild
index c748923bd..6ff823842 100755
--- a/source/d/autoconf/autoconf.SlackBuild
+++ b/source/d/autoconf/autoconf.SlackBuild
@@ -26,7 +26,7 @@ PKGNAM=autoconf
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) "}
# Note: the package is _built_ as 'noarch'
diff --git a/source/d/automake/automake.SlackBuild b/source/d/automake/automake.SlackBuild
index 810eb3152..fc2c46986 100755
--- a/source/d/automake/automake.SlackBuild
+++ b/source/d/automake/automake.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=automake
VERSION=${VERSION:-$(echo automake-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
BUILD=${BUILD:-2}
# Note: the package is _built_ as 'noarch'
diff --git a/source/d/binutils/binutils.SlackBuild b/source/d/binutils/binutils.SlackBuild
index 3cb4f27a3..d628b45c9 100755
--- a/source/d/binutils/binutils.SlackBuild
+++ b/source/d/binutils/binutils.SlackBuild
@@ -48,7 +48,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
exit 0
fi
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
# Uncomment this to include the experimental gold linker:
GOLD=" --enable-gold=yes --enable-ld=default "
diff --git a/source/d/bison/bison.SlackBuild b/source/d/bison/bison.SlackBuild
index 03b8b41b8..f83de5306 100755
--- a/source/d/bison/bison.SlackBuild
+++ b/source/d/bison/bison.SlackBuild
@@ -26,7 +26,7 @@ PKGNAM=bison
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:--j6}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/d/ccache/ccache.SlackBuild b/source/d/ccache/ccache.SlackBuild
index 0ffab1565..0b4b235fd 100755
--- a/source/d/ccache/ccache.SlackBuild
+++ b/source/d/ccache/ccache.SlackBuild
@@ -47,7 +47,7 @@ fi
TMP=${TMP:-/tmp}
PKG=$TMP/package-ccache
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
rm -rf $PKG
mkdir -p $TMP $PKG
diff --git a/source/d/clisp/clisp.SlackBuild b/source/d/clisp/clisp.SlackBuild
index 3b210fdac..7ae8d5c99 100755
--- a/source/d/clisp/clisp.SlackBuild
+++ b/source/d/clisp/clisp.SlackBuild
@@ -64,7 +64,7 @@ fi
# Don't use icecream:
PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
TMP=${TMP:-/tmp}
PKG=$TMP/package-clisp
diff --git a/source/d/cmake/cmake.SlackBuild b/source/d/cmake/cmake.SlackBuild
index 6bd22500c..b20759875 100755
--- a/source/d/cmake/cmake.SlackBuild
+++ b/source/d/cmake/cmake.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 -m32 -march=i586 -mtune=i686"
diff --git a/source/d/cscope/cscope.SlackBuild b/source/d/cscope/cscope.SlackBuild
index df452d9d1..4ebf2c36a 100755
--- a/source/d/cscope/cscope.SlackBuild
+++ b/source/d/cscope/cscope.SlackBuild
@@ -47,7 +47,7 @@ fi
TMP=${TMP:-/tmp}
PKG=$TMP/package-cscope
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
diff --git a/source/d/cvs/cvs.SlackBuild b/source/d/cvs/cvs.SlackBuild
index 1c5583293..a378844f1 100755
--- a/source/d/cvs/cvs.SlackBuild
+++ b/source/d/cvs/cvs.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/d/distcc/distcc.SlackBuild b/source/d/distcc/distcc.SlackBuild
index 017a392a7..24f68aa26 100755
--- a/source/d/distcc/distcc.SlackBuild
+++ b/source/d/distcc/distcc.SlackBuild
@@ -58,7 +58,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-distcc
diff --git a/source/d/doxygen/doxygen.SlackBuild b/source/d/doxygen/doxygen.SlackBuild
index ce86b9f4a..a13503346 100755
--- a/source/d/doxygen/doxygen.SlackBuild
+++ b/source/d/doxygen/doxygen.SlackBuild
@@ -26,7 +26,7 @@ PKGNAM=doxygen
VERSION=${VERSION:-$(basename $(echo doxygen-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) .src)}
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/d/flex/flex.SlackBuild b/source/d/flex/flex.SlackBuild
index 76956313e..20bcdc448 100755
--- a/source/d/flex/flex.SlackBuild
+++ b/source/d/flex/flex.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/d/gcc/gcc.SlackBuild b/source/d/gcc/gcc.SlackBuild
index 2981291e2..6f93f767a 100755
--- a/source/d/gcc/gcc.SlackBuild
+++ b/source/d/gcc/gcc.SlackBuild
@@ -60,7 +60,7 @@ VERSION=$(echo $SRCVER | cut -f 1 -d _)
BUILD=${BUILD:-1}
# How many jobs to run in parallel:
-NUMJOBS=" -j 7 "
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/d/gdb/gdb.SlackBuild b/source/d/gdb/gdb.SlackBuild
index e697bf4a4..92cc11f88 100755
--- a/source/d/gdb/gdb.SlackBuild
+++ b/source/d/gdb/gdb.SlackBuild
@@ -26,7 +26,7 @@ PKGNAM=gdb
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/d/git/git.SlackBuild b/source/d/git/git.SlackBuild
index cd85e92e8..2411ba406 100755
--- a/source/d/git/git.SlackBuild
+++ b/source/d/git/git.SlackBuild
@@ -26,7 +26,7 @@ PKGNAM=git
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/d/gnucobol/gnucobol.SlackBuild b/source/d/gnucobol/gnucobol.SlackBuild
index e297a6403..49ee3d908 100755
--- a/source/d/gnucobol/gnucobol.SlackBuild
+++ b/source/d/gnucobol/gnucobol.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/d/gperf/gperf.SlackBuild b/source/d/gperf/gperf.SlackBuild
index 960df9153..3734908c5 100755
--- a/source/d/gperf/gperf.SlackBuild
+++ b/source/d/gperf/gperf.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/d/guile/guile.SlackBuild b/source/d/guile/guile.SlackBuild
index ff00e4190..6483d9e60 100755
--- a/source/d/guile/guile.SlackBuild
+++ b/source/d/guile/guile.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-guile
diff --git a/source/d/help2man/help2man.SlackBuild b/source/d/help2man/help2man.SlackBuild
index 00469327c..a34dc27f7 100755
--- a/source/d/help2man/help2man.SlackBuild
+++ b/source/d/help2man/help2man.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/d/icecream/get-icecream.sh b/source/d/icecream/get-icecream.sh
new file mode 100755
index 000000000..b4642231d
--- /dev/null
+++ b/source/d/icecream/get-icecream.sh
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+# Copyright 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.
+
+# Pull a stable branch + patches
+BRANCH=${1:-master}
+
+# Clear download area:
+rm -rf icecream
+
+# Clone repository:
+git clone git://github.com/icecc/icecream
+
+# checkout $BRANCH:
+( cd icecream
+ git checkout $BRANCH || exit 1
+)
+
+HEADISAT="$( cd icecream && git log -1 --format=%h )"
+DATE="$( cd icecream && git log -1 --format=%ad --date=format:%Y%m%d )"
+# Cleanup. We're not packing up the whole git repo.
+( cd icecream && find . -type d -name ".git*" -exec rm -rf {} \; 2> /dev/null )
+mv icecream icecream-${DATE}_${HEADISAT}
+tar cf icecream-${DATE}_${HEADISAT}.tar icecream-${DATE}_${HEADISAT}
+plzip -9 -f icecream-${DATE}_${HEADISAT}.tar
+rm -rf icecream-${DATE}_${HEADISAT}
+echo
+echo "icecream branch $BRANCH with HEAD at $HEADISAT packaged as icecream-${DATE}_${HEADISAT}.tar.lz"
+echo
diff --git a/source/d/icecream/icecream.SlackBuild b/source/d/icecream/icecream.SlackBuild
index f3c25d73b..fb7245652 100755
--- a/source/d/icecream/icecream.SlackBuild
+++ b/source/d/icecream/icecream.SlackBuild
@@ -61,7 +61,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
exit 0
fi
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
diff --git a/source/d/icecream/rc.icecc-scheduler b/source/d/icecream/rc.icecc-scheduler
index b407f26e7..e04be1087 100644
--- a/source/d/icecream/rc.icecc-scheduler
+++ b/source/d/icecream/rc.icecc-scheduler
@@ -10,8 +10,8 @@
# Start scheduler:
scheduler_start() {
if [ -x /usr/sbin/icecc-scheduler ]; then
- echo "Starting distributed compiler scheduler: /usr/sbin/icecc-scheduler $ICECC_SCHEDULER_OPTIONS"
- /usr/sbin/icecc-scheduler $ICECC_SCHEDULER_OPTIONS
+ echo "Starting distributed compiler scheduler: /usr/sbin/icecc-scheduler $ICECC_SCHEDULER_OPTIONS $ICECC_SCHEDULER_EXTRA_OPTIONS"
+ /usr/sbin/icecc-scheduler $ICECC_SCHEDULER_OPTIONS $ICECC_SCHEDULER_EXTRA_OPTIONS
fi
}
diff --git a/source/d/icecream/rc.iceccd b/source/d/icecream/rc.iceccd
index 93b4d1702..f2b6f82c6 100644
--- a/source/d/icecream/rc.iceccd
+++ b/source/d/icecream/rc.iceccd
@@ -10,8 +10,8 @@
# Start iceccd:
iceccd_start() {
if [ -x /usr/sbin/iceccd ]; then
- echo "Starting distributed compiler daemon: /usr/sbin/iceccd $ICECCD_OPTIONS"
- /usr/sbin/iceccd $ICECCD_OPTIONS
+ echo "Starting distributed compiler daemon: /usr/sbin/iceccd $ICECCD_OPTIONS $ICECCD_JOBS $ICECCD_NICENESS $ICECCD_EXTRA_OPTIONS"
+ /usr/sbin/iceccd $ICECCD_OPTIONS $ICECCD_JOBS $ICECCD_NICENESS $ICECCD_EXTRA_OPTIONS
fi
}
diff --git a/source/d/icecream/rc.icecream.conf b/source/d/icecream/rc.icecream.conf
index ce91ce65a..d0bfaadf0 100644
--- a/source/d/icecream/rc.icecream.conf
+++ b/source/d/icecream/rc.icecream.conf
@@ -10,6 +10,23 @@ ICECC_NETWORK=$(hostname -d)
# Defines the options passed to icecc-scheduler:
ICECC_SCHEDULER_OPTIONS="-n $ICECC_NETWORK -d -l /var/log/icecream/icecc-scheduler.log"
+# This is for adding any other custom options to icecc-scheduler.
+# See "man icecc-scheduler" for available options.
+ICECC_SCHEDULER_EXTRA_OPTIONS=""
+
# Defines the options passed to iceccd:
ICECCD_OPTIONS="-n $ICECC_NETWORK -d -b /var/cache/icecream -l /var/log/icecream/iceccd.log"
+# Maximum number of compile jobs started in parallel on machine running the
+# daemon. The default set below is the number of threads the CPU can handle,
+# plus one.
+ICECCD_JOBS="-m $(expr $(nproc) + 1)"
+
+# The level of niceness to use. Default is 5.
+# Lower values increase iceccd performance.
+#ICECCD_NICENESS="--nice 5"
+
+# This is for adding any other custom options to iceccd.
+# See "man iceccd" for available options.
+ICECCD_EXTRA_OPTIONS=""
+
diff --git a/source/d/indent/indent.SlackBuild b/source/d/indent/indent.SlackBuild
index 9dd73c594..ff09dbb91 100755
--- a/source/d/indent/indent.SlackBuild
+++ b/source/d/indent/indent.SlackBuild
@@ -56,7 +56,7 @@ else
SLKCFLAGS="-O2"
fi
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
TMP=${TMP:-/tmp}
PKG=$TMP/package-indent
diff --git a/source/d/intltool/intltool.SlackBuild b/source/d/intltool/intltool.SlackBuild
index 427f48b77..6b46828c7 100755
--- a/source/d/intltool/intltool.SlackBuild
+++ b/source/d/intltool/intltool.SlackBuild
@@ -26,7 +26,7 @@ PKGNAM=intltool
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
BUILD=${BUILD:-4}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/d/libtool/libtool.SlackBuild b/source/d/libtool/libtool.SlackBuild
index 2f5580074..cda26ea67 100755
--- a/source/d/libtool/libtool.SlackBuild
+++ b/source/d/libtool/libtool.SlackBuild
@@ -26,7 +26,7 @@ PKGNAM=libtool
VERSION=${VERSION:-$(echo libtool-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
BUILD=${BUILD:-9}
-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/d/llvm/clang-tools-extra.no.clangd.diff b/source/d/llvm/clang-tools-extra.no.clangd.diff
new file mode 100644
index 000000000..cae833069
--- /dev/null
+++ b/source/d/llvm/clang-tools-extra.no.clangd.diff
@@ -0,0 +1,20 @@
+--- ./tools/clang/tools/extra/CMakeLists.txt.orig 2018-03-22 18:34:46.000000000 -0500
++++ ./tools/clang/tools/extra/CMakeLists.txt 2018-09-20 18:03:37.034041551 -0500
+@@ -10,17 +10,10 @@
+ add_subdirectory(clang-doc)
+ add_subdirectory(clang-query)
+ add_subdirectory(clang-move)
+-add_subdirectory(clangd)
+ add_subdirectory(include-fixer)
+ add_subdirectory(pp-trace)
+ add_subdirectory(tool-template)
+
+-# Add the common testsuite after all the tools.
+-if(CLANG_INCLUDE_TESTS)
+-add_subdirectory(test)
+-add_subdirectory(unittests)
+-endif()
+-
+ option(CLANG_TOOLS_EXTRA_INCLUDE_DOCS "Generate build targets for the Clang Extra Tools docs."
+ ${LLVM_INCLUDE_DOCS})
+ if( CLANG_TOOLS_EXTRA_INCLUDE_DOCS )
diff --git a/source/d/llvm/clang.toolchains.i586.triple.diff b/source/d/llvm/clang.toolchains.i586.triple.diff
index 01b87c68a..55e0adc99 100644
--- a/source/d/llvm/clang.toolchains.i586.triple.diff
+++ b/source/d/llvm/clang.toolchains.i586.triple.diff
@@ -1,13 +1,12 @@
---- ./tools/clang/lib/Driver/ToolChains/Gnu.cpp.orig 2017-08-10 20:47:32.000000000 -0500
-+++ ./tools/clang/lib/Driver/ToolChains/Gnu.cpp 2017-09-07 14:41:16.170110145 -0500
-@@ -1834,8 +1834,8 @@
+--- ./tools/clang/lib/Driver/ToolChains/Gnu.cpp.orig 2018-07-31 09:21:46.000000000 -0500
++++ ./tools/clang/lib/Driver/ToolChains/Gnu.cpp 2018-09-19 15:29:29.077917414 -0500
+@@ -1842,7 +1842,8 @@
"i686-linux-gnu", "i686-pc-linux-gnu", "i486-linux-gnu",
"i386-linux-gnu", "i386-redhat-linux6E", "i686-redhat-linux",
"i586-redhat-linux", "i386-redhat-linux", "i586-suse-linux",
-- "i486-slackware-linux", "i686-montavista-linux", "i686-linux-android",
-- "i586-linux-gnu"};
-+ "i486-slackware-linux", "i586-slackware-linux", "i686-montavista-linux",
-+ "i686-linux-android", "i586-linux-gnu"};
+- "i486-slackware-linux", "i686-montavista-linux", "i586-linux-gnu"};
++ "i486-slackware-linux", "i586-slackware-linux", "i686-slackware-linux",
++ "i686-montavista-linux", "i586-linux-gnu"};
static const char *const MIPSLibDirs[] = {"/lib"};
static const char *const MIPSTriples[] = {"mips-linux-gnu", "mips-mti-linux",
diff --git a/source/d/llvm/llvm.SlackBuild b/source/d/llvm/llvm.SlackBuild
index 591ed74db..84533d48a 100755
--- a/source/d/llvm/llvm.SlackBuild
+++ b/source/d/llvm/llvm.SlackBuild
@@ -27,9 +27,9 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=llvm
VERSION=${VERSION:-$(echo llvm-*.tar.xz | rev | cut -f 4- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -101,11 +101,15 @@ cd ../
# Support GCC built for i586-slackware-linux:
zcat $CWD/clang.toolchains.i586.triple.diff.gz | patch -p1 --verbose || exit 1
-## This seems obsolete, so commenting it out:
-#
-## Use i586 $ARCH on 32-bit x86:
-#sed -r "/ifeq.*CompilerTargetArch/s#i386#i586#g" \
-# -i projects/compiler-rt/make/platform/clang_linux.mk
+# As of clang-tools-extra-7.0.0 we get the following error on i586 or i686:
+# CMakeFiles/clangDaemon.dir/Trace.cpp.o:Trace.cpp:function std::unique_ptr<clang::clangd::trace::(anonymous namespace)::JSONTracer::JSONSpan, std::default_delete<clang::clangd::trace::(anonymous namespace)::JSONTracer::JSONSpan> >::~unique_ptr(): error: undefined reference to '__atomic_load_8'
+# Attempts to try to fix this have failed here, so for now we will not build
+# clangd to avoid the failure. Any help with a proper fix is appreciated.
+# I have not reported this upstream since I suspect that it's an artifact
+# of our convoluted build method.
+if [ $ARCH = i586 ] || [ $ARCH = i686 ]; then
+ zcat $CWD/clang-tools-extra.no.clangd.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
+fi
chown -R root:root .
find . \
@@ -134,6 +138,7 @@ cd build
-DCLANG_BUILD_SHARED_LIBS=ON \
-DLLVM_BUILD_LLVM_DYLIB=ON \
-DLLVM_LINK_LLVM_DYLIB=ON \
+ -DLLVM_USE_LINKER=gold \
-DLLVM_ENABLE_RTTI=ON \
-DLLVM_ENABLE_FFI=ON \
-DLLVM_ENABLE_ASSERTIONS=OFF \
@@ -142,10 +147,37 @@ cd build
-DCLANG_RESOURCE_DIR="../lib${LIBDIRSUFFIX}/clang/${VERSION}" \
.. || exit 1
- # breaks with one of the patches above. Maybe revisit later
+ # Breaks with one of the patches above. Maybe revisit later?
# -DBUILD_SHARED_LIBS=ON \
- make $NUMJOBS VERBOSE=1 || make || exit 1
+ # This seems to not like a parallel build, at least as of 7.0.0. I don't have
+ # days to wait for the compile though, so let's just smack it with a hammer
+ # fifty times before dropping back to a single-threaded build:
+ for index in $(seq 1 50) ; do
+ #make $NUMJOBS VERBOSE=1
+ make $NUMJOBS
+ ERR_RESULT=$?
+ if [ $ERR_RESULT = 0 ]; then
+ break
+ fi
+ echo "*** PARALLEL MAKE RESTART NUMBER $index"
+ done
+ if [ ! $ERR_RESULT = 0 ]; then
+ # Fifty more for the single thread:
+ for index in $(seq 1 50) ; do
+ #make VERBOSE=1
+ make
+ ERR_RESULT=$?
+ if [ $ERR_RESULT = 0 ]; then
+ break
+ fi
+ echo "*** NON-PARALLEL MAKE RESTART NUMBER $index"
+ done
+ fi
+ if [ ! $ERR_RESULT = 0 ]; then
+ exit 1
+ fi
+
make install DESTDIR=$PKG || exit 1
cd ..
diff --git a/source/d/llvm/llvm.url b/source/d/llvm/llvm.url
index ee6a1240a..4bc32c8f5 100644
--- a/source/d/llvm/llvm.url
+++ b/source/d/llvm/llvm.url
@@ -1,8 +1,8 @@
-http://llvm.org/releases/6.0.1/llvm-6.0.1.src.tar.xz
-http://llvm.org/releases/6.0.1/cfe-6.0.1.src.tar.xz
-http://llvm.org/releases/6.0.1/clang-tools-extra-6.0.1.src.tar.xz
-http://llvm.org/releases/6.0.1/compiler-rt-6.0.1.src.tar.xz
-http://llvm.org/releases/6.0.1/lldb-6.0.1.src.tar.xz
-http://llvm.org/releases/6.0.1/openmp-6.0.1.src.tar.xz
-http://llvm.org/releases/6.0.1/libcxx-6.0.1.src.tar.xz
-http://llvm.org/releases/6.0.1/libcxxabi-6.0.1.src.tar.xz
+http://llvm.org/releases/7.0.0/llvm-7.0.0.src.tar.xz
+http://llvm.org/releases/7.0.0/cfe-7.0.0.src.tar.xz
+http://llvm.org/releases/7.0.0/clang-tools-extra-7.0.0.src.tar.xz
+http://llvm.org/releases/7.0.0/compiler-rt-7.0.0.src.tar.xz
+http://llvm.org/releases/7.0.0/lldb-7.0.0.src.tar.xz
+http://llvm.org/releases/7.0.0/openmp-7.0.0.src.tar.xz
+http://llvm.org/releases/7.0.0/libcxx-7.0.0.src.tar.xz
+http://llvm.org/releases/7.0.0/libcxxabi-7.0.0.src.tar.xz
diff --git a/source/d/m4/m4.SlackBuild b/source/d/m4/m4.SlackBuild
index e297a1830..886cbc1ec 100755
--- a/source/d/m4/m4.SlackBuild
+++ b/source/d/m4/m4.SlackBuild
@@ -26,7 +26,7 @@ PKGNAM=m4
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
BUILD=${BUILD:-2}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -73,6 +73,9 @@ cd $TMP
rm -rf m4-$VERSION
tar xvf $CWD/m4-$VERSION.tar.xz || exit 1
cd m4-$VERSION || exit 1
+
+zcat $CWD/m4.glibc228.diff.gz | patch -p1 --verbose || exit 1
+
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/source/d/m4/m4.glibc228.diff b/source/d/m4/m4.glibc228.diff
new file mode 100644
index 000000000..544296686
--- /dev/null
+++ b/source/d/m4/m4.glibc228.diff
@@ -0,0 +1,108 @@
+--- ./lib/stdio-impl.h.orig 2016-12-31 07:54:42.000000000 -0600
++++ ./lib/stdio-impl.h 2018-09-18 18:53:02.236064705 -0500
+@@ -18,6 +18,12 @@
+ the same implementation of stdio extension API, except that some fields
+ have different naming conventions, or their access requires some casts. */
+
++/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this
++ problem by defining it ourselves. FIXME: Do not rely on glibc
++ internals. */
++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
++# define _IO_IN_BACKUP 0x100
++#endif
+
+ /* BSD stdio derived implementations. */
+
+--- ./lib/freading.c.orig 2016-12-31 07:54:41.000000000 -0600
++++ ./lib/freading.c 2018-09-18 18:53:02.234064705 -0500
+@@ -31,7 +31,7 @@
+ /* Most systems provide FILE as a struct and the necessary bitmask in
+ <stdio.h>, because they need it for implementing getc() and putc() as
+ fast macros. */
+-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ return ((fp->_flags & _IO_NO_WRITES) != 0
+ || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0
+ && fp->_IO_read_base != NULL));
+--- ./lib/fflush.c.orig 2016-12-31 07:54:41.000000000 -0600
++++ ./lib/fflush.c 2018-09-18 18:53:02.229064705 -0500
+@@ -33,7 +33,7 @@
+ #undef fflush
+
+
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+
+ /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */
+ static void
+@@ -72,7 +72,7 @@
+
+ #endif
+
+-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
++#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
+
+ # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
+@@ -148,7 +148,7 @@
+ if (stream == NULL || ! freading (stream))
+ return fflush (stream);
+
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+
+ clear_ungetc_buffer_preserving_position (stream);
+
+--- ./lib/freadahead.c.orig 2016-12-31 07:54:41.000000000 -0600
++++ ./lib/freadahead.c 2018-09-18 18:53:02.234064705 -0500
+@@ -25,7 +25,7 @@
+ size_t
+ freadahead (FILE *fp)
+ {
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ if (fp->_IO_write_ptr > fp->_IO_write_base)
+ return 0;
+ return (fp->_IO_read_end - fp->_IO_read_ptr)
+--- ./lib/fpending.c.orig 2016-12-31 07:54:41.000000000 -0600
++++ ./lib/fpending.c 2018-09-18 18:53:02.231064705 -0500
+@@ -32,7 +32,7 @@
+ /* Most systems provide FILE as a struct and the necessary bitmask in
+ <stdio.h>, because they need it for implementing getc() and putc() as
+ fast macros. */
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ return fp->_IO_write_ptr - fp->_IO_write_base;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
+--- ./lib/fpurge.c.orig 2016-12-31 07:54:41.000000000 -0600
++++ ./lib/fpurge.c 2018-09-18 18:53:02.233064705 -0500
+@@ -62,7 +62,7 @@
+ /* Most systems provide FILE as a struct and the necessary bitmask in
+ <stdio.h>, because they need it for implementing getc() and putc() as
+ fast macros. */
+-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ fp->_IO_read_end = fp->_IO_read_ptr;
+ fp->_IO_write_ptr = fp->_IO_write_base;
+ /* Avoid memory leak when there is an active ungetc buffer. */
+--- ./lib/fseeko.c.orig 2016-12-31 07:54:41.000000000 -0600
++++ ./lib/fseeko.c 2018-09-18 18:53:02.235064705 -0500
+@@ -47,7 +47,7 @@
+ #endif
+
+ /* These tests are based on fpurge.c. */
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ if (fp->_IO_read_end == fp->_IO_read_ptr
+ && fp->_IO_write_ptr == fp->_IO_write_base
+ && fp->_IO_save_base == NULL)
+@@ -123,7 +123,7 @@
+ return -1;
+ }
+
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ fp->_flags &= ~_IO_EOF_SEEN;
+ fp->_offset = pos;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
diff --git a/source/d/make/make.SlackBuild b/source/d/make/make.SlackBuild
index e31e5798b..b086b4d44 100755
--- a/source/d/make/make.SlackBuild
+++ b/source/d/make/make.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-make
diff --git a/source/d/ninja/ninja.SlackBuild b/source/d/ninja/ninja.SlackBuild
index 007cc6d1d..4b66bdf0d 100755
--- a/source/d/ninja/ninja.SlackBuild
+++ b/source/d/ninja/ninja.SlackBuild
@@ -27,7 +27,7 @@ PKGNAM=ninja
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/d/opencl-headers/opencl-headers.SlackBuild b/source/d/opencl-headers/opencl-headers.SlackBuild
index edb041ec9..3c9e0cab4 100755
--- a/source/d/opencl-headers/opencl-headers.SlackBuild
+++ b/source/d/opencl-headers/opencl-headers.SlackBuild
@@ -30,7 +30,7 @@ VERSION=${VERSION:-$(echo OpenCL-Headers-*.tar.?z* | rev | cut -f 3- -d . | cut
PKGVER=${PKGVER:-2.1}
BUILD=${BUILD:-2}
-NUMJOBS=${NUMJOBS:--j7}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
ARCH=noarch
diff --git a/source/d/oprofile/oprofile.SlackBuild b/source/d/oprofile/oprofile.SlackBuild
index 93d804c5f..84f0240ac 100755
--- a/source/d/oprofile/oprofile.SlackBuild
+++ b/source/d/oprofile/oprofile.SlackBuild
@@ -26,7 +26,7 @@ PKGNAM=oprofile
VERSION=${VERSION:-$(echo oprofile-*.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/d/p2c/p2c.SlackBuild b/source/d/p2c/p2c.SlackBuild
index 4f6c255dc..c2d352cbc 100755
--- a/source/d/p2c/p2c.SlackBuild
+++ b/source/d/p2c/p2c.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/d/parallel/parallel.SlackBuild b/source/d/parallel/parallel.SlackBuild
index 2677ce32b..806c57545 100755
--- a/source/d/parallel/parallel.SlackBuild
+++ b/source/d/parallel/parallel.SlackBuild
@@ -37,7 +37,7 @@ if [ -z "$ARCH" ]; then
export ARCH
fi
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
diff --git a/source/d/patchelf/patchelf.SlackBuild b/source/d/patchelf/patchelf.SlackBuild
index 7afb9c455..c5f480eb8 100755
--- a/source/d/patchelf/patchelf.SlackBuild
+++ b/source/d/patchelf/patchelf.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/d/perl/perl.SlackBuild b/source/d/perl/perl.SlackBuild
index 7ef0f6cdd..5607a1d8b 100755
--- a/source/d/perl/perl.SlackBuild
+++ b/source/d/perl/perl.SlackBuild
@@ -47,7 +47,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
exit 0
fi
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
# Set to "yes" to run tests:
MAKETEST=${MAKETEST:-no}
diff --git a/source/d/pkg-config/pkg-config.SlackBuild b/source/d/pkg-config/pkg-config.SlackBuild
index b1b05903a..34de2509f 100755
--- a/source/d/pkg-config/pkg-config.SlackBuild
+++ b/source/d/pkg-config/pkg-config.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-pkg-config
diff --git a/source/d/python/python.SlackBuild b/source/d/python/python.SlackBuild
index 29deb4267..d1d37a6db 100755
--- a/source/d/python/python.SlackBuild
+++ b/source/d/python/python.SlackBuild
@@ -28,7 +28,7 @@ VERSION=$(echo $SRCNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
BRANCH_VERSION=$(echo $VERSION | cut -f 1,2 -d . )
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/d/python3/python3.SlackBuild b/source/d/python3/python3.SlackBuild
index aab27507f..1b47ad068 100755
--- a/source/d/python3/python3.SlackBuild
+++ b/source/d/python3/python3.SlackBuild
@@ -31,7 +31,7 @@ VERSION=$(echo $SRCNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
BRANCH_VERSION=$(echo $VERSION | cut -f 1,2 -d . )
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/d/rcs/rcs.SlackBuild b/source/d/rcs/rcs.SlackBuild
index d0bc509e8..e89d96740 100755
--- a/source/d/rcs/rcs.SlackBuild
+++ b/source/d/rcs/rcs.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/d/re2c/re2c.SlackBuild b/source/d/re2c/re2c.SlackBuild
index 98f8976f9..f4a061281 100755
--- a/source/d/re2c/re2c.SlackBuild
+++ b/source/d/re2c/re2c.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/d/ruby/ruby.SlackBuild b/source/d/ruby/ruby.SlackBuild
index cac96affb..b0475a023 100755
--- a/source/d/ruby/ruby.SlackBuild
+++ b/source/d/ruby/ruby.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-ruby
diff --git a/source/d/rust/rust.SlackBuild b/source/d/rust/rust.SlackBuild
index 7ceb99fa9..3c8391ee1 100755
--- a/source/d/rust/rust.SlackBuild
+++ b/source/d/rust/rust.SlackBuild
@@ -112,7 +112,7 @@ PKG=$TMP/package-$PKGNAM
# Not needed, as the build will automatically use as many jobs as there are
# cores.
-#NUMJOBS=${NUMJOBS:-" -j7 "}
+#NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
diff --git a/source/d/strace/strace.SlackBuild b/source/d/strace/strace.SlackBuild
index 393776b4e..bc5309dc3 100755
--- a/source/d/strace/strace.SlackBuild
+++ b/source/d/strace/strace.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/d/subversion/subversion.SlackBuild b/source/d/subversion/subversion.SlackBuild
index 64eeca48b..33f51f9c3 100755
--- a/source/d/subversion/subversion.SlackBuild
+++ b/source/d/subversion/subversion.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/d/swig/swig.SlackBuild b/source/d/swig/swig.SlackBuild
index 99f78f0c3..e3b4982c1 100755
--- a/source/d/swig/swig.SlackBuild
+++ b/source/d/swig/swig.SlackBuild
@@ -58,7 +58,7 @@ else
SLKCFLAGS="-O2"
fi
-NUMJOBS=${NUMJOBS:--j6}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
rm -rf $PKG
mkdir -p $TMP $PKG