diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2023-01-19 21:07:32 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2023-01-19 22:32:40 +0100 |
| commit | 14094b8867a3f7e7e1012a29da49d5b2cce683d5 (patch) | |
| tree | 7fbbb6c6164d9d4c9377a325ba8e2d3dd7998ebe /source/a/pkgtools | |
| parent | f493ddecac957a63e0ffb71febc2fcf454113aa3 (diff) | |
| download | current-14094b8867a3f7e7e1012a29da49d5b2cce683d5.tar.gz current-14094b8867a3f7e7e1012a29da49d5b2cce683d5.tar.xz | |
Thu Jan 19 21:07:32 UTC 202320230119210732
a/pkgtools-15.1-noarch-4.txz: Rebuilt.
makepkg: also let xz decide how many threads to use on ARM platforms aarch64
and riscv64. Thanks to Stuart Winter.
installpkg: fix reversed test for if a --threads option was given. It appears
that it's been wrong for years but since xz didn't support threaded
decompression yet it wasn't noticed.
a/xz-5.4.1-x86_64-2.txz: Rebuilt.
Reduce default verbosity from V_WARNING to V_ERROR to avoid sending non-fatal
memory usage information to stderr.
kde/plasma-wayland-protocols-1.10.0-x86_64-1.txz: Upgraded.
l/exiv2-0.27.6-x86_64-1.txz: Upgraded.
l/tdb-1.4.8-x86_64-1.txz: Upgraded.
x/igt-gpu-tools-1.27.1-x86_64-1.txz: Upgraded.
x/libX11-1.8.3-x86_64-2.txz: Rebuilt.
[PATCH] Fix a9e845 and 797755 Allow X*IfEvent() to reenter libX11
Thanks to marav.
Diffstat (limited to 'source/a/pkgtools')
| -rwxr-xr-x | source/a/pkgtools/pkgtools.SlackBuild | 2 | ||||
| -rw-r--r-- | source/a/pkgtools/scripts/installpkg | 4 | ||||
| -rw-r--r-- | source/a/pkgtools/scripts/makepkg | 6 |
3 files changed, 5 insertions, 7 deletions
diff --git a/source/a/pkgtools/pkgtools.SlackBuild b/source/a/pkgtools/pkgtools.SlackBuild index 67058d409..ab2f57334 100755 --- a/source/a/pkgtools/pkgtools.SlackBuild +++ b/source/a/pkgtools/pkgtools.SlackBuild @@ -30,7 +30,7 @@ PKGNAM=pkgtools # *** UPDATE THESE WITH EACH BUILD: VERSION=15.1 ARCH=${ARCH:-noarch} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} # 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/a/pkgtools/scripts/installpkg b/source/a/pkgtools/scripts/installpkg index 64791afc6..c5c6ee2af 100644 --- a/source/a/pkgtools/scripts/installpkg +++ b/source/a/pkgtools/scripts/installpkg @@ -360,7 +360,7 @@ if [ "$MODE" = "warn" ]; then fi ;; 'txz' ) - if [ ! "$XZ_THREADS_FORCED" = "yes" ]; then + if [ "$XZ_THREADS_FORCED" = "yes" ]; then packagecompression="xz --threads=${THREADS}" else # Let xz determine how many threads to use: @@ -449,7 +449,7 @@ for package in $* ; do fi ;; 'txz' ) - if [ ! "$XZ_THREADS_FORCED" = "yes" ]; then + if [ "$XZ_THREADS_FORCED" = "yes" ]; then packagecompression="xz --threads=${THREADS}" else # Let xz determine how many threads to use: diff --git a/source/a/pkgtools/scripts/makepkg b/source/a/pkgtools/scripts/makepkg index 72746fa84..7ddf5dbd4 100644 --- a/source/a/pkgtools/scripts/makepkg +++ b/source/a/pkgtools/scripts/makepkg @@ -251,8 +251,7 @@ elif [ ! "$(basename $PACKAGE_NAME .tar.lzma)" = "$PACKAGE_NAME" ]; then elif [ ! "$(basename $PACKAGE_NAME .txz)" = "$PACKAGE_NAME" ]; then EXTENSION="txz" if [ ! "$XZ_THREADS_FORCED" = "yes" ]; then - # TODO: Add ARM 64-bit $ARCHes to this test: - if [ "$(uname -m)" = "x86_64" ]; then + if [[ "$(uname -m)" =~ (x86_64|aarch64|riscv64) ]]; then # Allow xz to determine how many threads to use: COMPRESSOR="xz ${COMPRESS_OPTION} --threads=0 -c" else @@ -269,8 +268,7 @@ elif [ ! "$(basename $PACKAGE_NAME .txz)" = "$PACKAGE_NAME" ]; then elif [ ! "$(basename $PACKAGE_NAME .tar.xz)" = "$PACKAGE_NAME" ]; then EXTENSION="tar.xz" if [ ! "$XZ_THREADS_FORCED" = "yes" ]; then - # TODO: Add ARM 64-bit $ARCHes to this test: - if [ "$(uname -m)" = "x86_64" ]; then + if [[ "$(uname -m)" =~ (x86_64|aarch64|riscv64) ]]; then # Allow xz to determine how many threads to use: COMPRESSOR="xz ${COMPRESS_OPTION} --threads=0 -c" else |