diff options
| author |   B. Watson | 2022-02-21 22:02:15 +0100 |
|---|---|---|
| committer |   Robby Workman | 2022-02-22 00:16:50 +0100 |
| commit | 7c0947548de8557502a3c7d07a44f72d93e2431b (patch) | |
| tree | 4d48811f5e3b9426a4de9c1fa508c2cfa97ad626 /games/wesnoth | |
| parent | 98ca222b48d035594635c744048bf52bb1fa3734 (diff) | |
| download | slackbuilds-7c0947548de8557502a3c7d07a44f72d93e2431b.tar.gz | |
games/wesnoth: Fix 15.0 build, better parallel support.
Signed-off-by: B. Watson <yalhcru@gmail.com>
Diffstat (limited to 'games/wesnoth')
| -rw-r--r-- | games/wesnoth/wesnoth.SlackBuild | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/games/wesnoth/wesnoth.SlackBuild b/games/wesnoth/wesnoth.SlackBuild index 6a736caf25..9d0b6faedf 100644 --- a/games/wesnoth/wesnoth.SlackBuild +++ b/games/wesnoth/wesnoth.SlackBuild @@ -33,7 +33,6 @@ VERSION=${VERSION:-1.16.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} -NUMJOBs=${NUMJOBS:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -43,9 +42,6 @@ if [ -z "$ARCH" ]; then 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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -77,6 +73,20 @@ fi set -e +if [ -z "$NUMJOBS" ]; then + # 20220221 bkw: everything else respects MAKEFLAGS, set NUMJOBS here + # from environment MAKEFLAGS, if we can... + NUMJOBS="$( echo $MAKEFLAGS | sed 's,.*-j *\([0-9][0-9]*\).*,\1,' )" + + # ...if not, cores - 1: + [ -z "$NUMJOBS" ] && NUMJOBS=$(( $( nproc ) - 1 )) + + # ...but not if we only had one core! + [ "$NUMJOBS" = "0" ] && NUMJOBS=1 +fi + +echo "=== NUMJOBS='$NUMJOBS'" + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT rm -rf $TMP/$PRGNAM-$VERSION @@ -87,9 +97,9 @@ cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ + -o -perm 511 \) -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ scons \ CXXFLAGS="$SLKCFLAGS" \ |