From: fsLeg Date: Wed, 1 Jan 2025 12:07:06 +0000 (+0300) Subject: Removed NUMJOBS. Use MAKEFLAGS instead X-Git-Url: https://git.t-rg.ws/?a=commitdiff_plain;h=bc000077ebbb9dc777e9bd6d74c275a88c52d8ff;p=slackbuilds.git Removed NUMJOBS. Use MAKEFLAGS instead --- diff --git a/dart-sass/dart-sass.SlackBuild b/dart-sass/dart-sass.SlackBuild index 5a107cd..53a42d3 100755 --- a/dart-sass/dart-sass.SlackBuild +++ b/dart-sass/dart-sass.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for dart-sass -# Copyright 2022-2024 Vladislav 'fsLeg' Borisov, Moscow, Russia +# Copyright 2022-2025 Vladislav 'fsLeg' Borisov, Moscow, Russia # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/dumptorrent/dumptorrent.SlackBuild b/dumptorrent/dumptorrent.SlackBuild index 51b6bce..0e3dd8d 100755 --- a/dumptorrent/dumptorrent.SlackBuild +++ b/dumptorrent/dumptorrent.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for dumptorrent -# Copyright 2015-2024 Vladislav 'fsLeg' Borisov, Moscow, Russia +# Copyright 2015-2025 Vladislav 'fsLeg' Borisov, Moscow, Russia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -30,11 +30,6 @@ BUILD=${BUILD:-1} TAG=${TAG:-fsleg} PKGTYPE=${PKGTYPE:-txz} -# Use parallel building if possible -if [ -z "$NUMJOBS" ]; then - NUMJOBS=$(nproc) -fi - if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i586 ;; @@ -80,7 +75,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -make -j${NUMJOBS} dumptorrent CFLAGS="${SLKCFLAGS}" +make dumptorrent CFLAGS="${SLKCFLAGS}" # There's no 'install' target and no documentation, so we just copy the binary # to a correct location and package it. diff --git a/fdpowermon/fdpowermon.SlackBuild b/fdpowermon/fdpowermon.SlackBuild index 0419bf1..6b9b2fb 100755 --- a/fdpowermon/fdpowermon.SlackBuild +++ b/fdpowermon/fdpowermon.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for dart-sass -# Copyright 2022-2024 Vladislav 'fsLeg' Borisov, Moscow, Russia +# Copyright 2022-2025 Vladislav 'fsLeg' Borisov, Moscow, Russia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -74,8 +74,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild # Create and package the man page mkdir -p $PKG/usr/man/man1 -/usr/bin/pod2man < fdpowermon | gzip -9 -c > $PKG/usr/man/man1/fdpowermon.1.gz - +pod2man < fdpowermon | gzip -9 -c > $PKG/usr/man/man1/fdpowermon.1.gz # Copy the slack-desc into ./install mkdir -p $PKG/install diff --git a/gxkb/gxkb.SlackBuild b/gxkb/gxkb.SlackBuild index 784cc58..0c5ab0b 100755 --- a/gxkb/gxkb.SlackBuild +++ b/gxkb/gxkb.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for gxkb # Copyright 2015-21 NK -# Copyright 2024 Vladislav 'fsLeg' Borisov, Moscow, Russia +# Copyright 2024-2025 Vladislav 'fsLeg' Borisov, Moscow, Russia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -31,11 +31,6 @@ BUILD=${BUILD:-1} TAG=${TAG:-fsleg} PKGTYPE=${PKGTYPE:-txz} -# Use parallel building if possible -if [ -z "$NUMJOBS" ]; then - NUMJOBS=$(nproc) -fi - if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i586 ;; @@ -108,7 +103,7 @@ CXXFLAGS="$SLKCFLAGS" \ --build=$ARCH-slackware-linux \ --enable-appindicator=no -make -j${NUMJOBS} +make make install DESTDIR=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/pyotherside/pyotherside.SlackBuild b/pyotherside/pyotherside.SlackBuild index a9310dc..785053b 100755 --- a/pyotherside/pyotherside.SlackBuild +++ b/pyotherside/pyotherside.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for pyotherside -# Copyright 2023-2024 Vladislav 'fsLeg' Borisov, Moscow, Russia +# Copyright 2023-2025 Vladislav 'fsLeg' Borisov, Moscow, Russia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -30,11 +30,6 @@ BUILD=${BUILD:-1} TAG=${TAG:-fsleg} PKGTYPE=${PKGTYPE:-txz} -# Use parallel building if possible -if [ -z "$NUMJOBS" ]; then - NUMJOBS=$(nproc) -fi - if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i586 ;; @@ -85,7 +80,7 @@ find -L . \ qmake CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ -make -j${NUMJOBS} +make make install INSTALL_ROOT=$PKG rm -rf $PKG/usr/tests diff --git a/pyscard/pyscard.SlackBuild b/pyscard/pyscard.SlackBuild index 5354ae5..6ea385d 100755 --- a/pyscard/pyscard.SlackBuild +++ b/pyscard/pyscard.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for pyscard -# Copyright 2023-2024 Vladislav 'fsLeg' Borisov, Moscow, Russia +# Copyright 2023-2025 Vladislav 'fsLeg' Borisov, Moscow, Russia # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/python-fido2/python-fido2.SlackBuild b/python-fido2/python-fido2.SlackBuild index a9b14b2..b3bc174 100755 --- a/python-fido2/python-fido2.SlackBuild +++ b/python-fido2/python-fido2.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for python-fido2 -# Copyright 2023-2024 Vladislav 'fsLeg' Borisov, Moscow, Russia +# Copyright 2023-2025 Vladislav 'fsLeg' Borisov, Moscow, Russia # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/saflashplayer-legacy/saflashplayer-legacy.SlackBuild b/saflashplayer-legacy/saflashplayer-legacy.SlackBuild index 36801fd..f3aa00f 100755 --- a/saflashplayer-legacy/saflashplayer-legacy.SlackBuild +++ b/saflashplayer-legacy/saflashplayer-legacy.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for saflashplayer-legacy -# Copyright 2015-2024 Vladislav 'fsLeg' Borisov, Moscow, Russia +# Copyright 2024-2025 Vladislav 'fsLeg' Borisov, Moscow, Russia # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/saflashplayer/saflashplayer.SlackBuild b/saflashplayer/saflashplayer.SlackBuild index a0cc2d4..4127899 100755 --- a/saflashplayer/saflashplayer.SlackBuild +++ b/saflashplayer/saflashplayer.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for saflashplayer -# Copyright 2015-2024 Vladislav 'fsLeg' Borisov, Moscow, Russia +# Copyright 2015-2025 Vladislav 'fsLeg' Borisov, Moscow, Russia # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/shadowsocks-rust/shadowsocks-rust.SlackBuild b/shadowsocks-rust/shadowsocks-rust.SlackBuild index dcc8ce1..45c41f2 100755 --- a/shadowsocks-rust/shadowsocks-rust.SlackBuild +++ b/shadowsocks-rust/shadowsocks-rust.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for shadowsocks-rust -# Copyright 2022-2024 Vladislav 'fsLeg' Borisov, Moscow, Russia +# Copyright 2022-2025 Vladislav 'fsLeg' Borisov, Moscow, Russia # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/yubikey-manager-qt/yubikey-manager-qt.SlackBuild b/yubikey-manager-qt/yubikey-manager-qt.SlackBuild index 0b3db8e..d7c43ac 100755 --- a/yubikey-manager-qt/yubikey-manager-qt.SlackBuild +++ b/yubikey-manager-qt/yubikey-manager-qt.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for yubikey-manager-qt -# Copyright 2023-2024 Vladislav 'fsLeg' Borisov, Moscow, Russia +# Copyright 2023-2025 Vladislav 'fsLeg' Borisov, Moscow, Russia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -30,11 +30,6 @@ BUILD=${BUILD:-2} TAG=${TAG:-fsleg} PKGTYPE=${PKGTYPE:-txz} -# Use parallel building if possible -if [ -z "$NUMJOBS" ]; then - NUMJOBS=$(nproc) -fi - if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i586 ;; @@ -89,7 +84,7 @@ patch -p1 < $CWD/363.patch qmake CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ -make -j${NUMJOBS} +make make install INSTALL_ROOT=$PKG # Strip binaries and libraries diff --git a/yubikey-manager/yubikey-manager.SlackBuild b/yubikey-manager/yubikey-manager.SlackBuild index ed788fe..122a72e 100755 --- a/yubikey-manager/yubikey-manager.SlackBuild +++ b/yubikey-manager/yubikey-manager.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for yubikey-manager -# Copyright 2023-2024 Vladislav 'fsLeg' Borisov, Moscow, Russia +# Copyright 2023-2025 Vladislav 'fsLeg' Borisov, Moscow, Russia # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/yubioath-desktop/yubioath-desktop.SlackBuild b/yubioath-desktop/yubioath-desktop.SlackBuild index 6496d4f..f77a732 100755 --- a/yubioath-desktop/yubioath-desktop.SlackBuild +++ b/yubioath-desktop/yubioath-desktop.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for yubioath-desktop -# Copyright 2023-2024 Vladislav 'fsLeg' Borisov, Moscow, Russia +# Copyright 2023-2025 Vladislav 'fsLeg' Borisov, Moscow, Russia # All rights reserved. # # Redistribution and use of this script, with or without modification, is