diff options
Diffstat (limited to '')
| -rw-r--r-- | source/a/pkgtools/scripts/installpkg | 4 | ||||
| -rw-r--r-- | source/a/pkgtools/scripts/makepkg | 6 |
2 files changed, 4 insertions, 6 deletions
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 |