diff options
Diffstat (limited to 'common/hooks/pre-pkg')
-rw-r--r-- | common/hooks/pre-pkg/04-generate-runtime-deps.sh | 2 | ||||
-rw-r--r-- | common/hooks/pre-pkg/05-prepare-32bit.sh | 2 | ||||
-rw-r--r-- | common/hooks/pre-pkg/06-shlib-provides.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/common/hooks/pre-pkg/04-generate-runtime-deps.sh b/common/hooks/pre-pkg/04-generate-runtime-deps.sh index b5307ff8226..498d8289342 100644 --- a/common/hooks/pre-pkg/04-generate-runtime-deps.sh +++ b/common/hooks/pre-pkg/04-generate-runtime-deps.sh @@ -56,7 +56,7 @@ hook() { mapshlibs=$XBPS_COMMONDIR/shlibs - if [ -n "$noarch" -o -n "$noverifyrdeps" ]; then + if [ "${archs// /}" = "noarch" -o -n "$noverifyrdeps" ]; then store_pkgdestdir_rundeps return 0 fi diff --git a/common/hooks/pre-pkg/05-prepare-32bit.sh b/common/hooks/pre-pkg/05-prepare-32bit.sh index 1b6a5ae2161..8440b3d36a8 100644 --- a/common/hooks/pre-pkg/05-prepare-32bit.sh +++ b/common/hooks/pre-pkg/05-prepare-32bit.sh @@ -21,7 +21,7 @@ hook() { return fi # Ignore noarch pkgs. - if [ -n "$noarch" ]; then + if [ "${archs// /}" = "noarch" ]; then return fi if [ -z "$lib32mode" ]; then diff --git a/common/hooks/pre-pkg/06-shlib-provides.sh b/common/hooks/pre-pkg/06-shlib-provides.sh index 66bb03ac058..480d614097b 100644 --- a/common/hooks/pre-pkg/06-shlib-provides.sh +++ b/common/hooks/pre-pkg/06-shlib-provides.sh @@ -45,7 +45,7 @@ collect_sonames() { hook() { local _destdir32=${XBPS_DESTDIR}/${pkgname}-32bit-${version} - if [ -z "$shlib_provides" -a -n "$noarch" -o -n "$noshlibprovides" ]; then + if [ -z "$shlib_provides" -a "${archs// /}" = "noarch" -o -n "$noshlibprovides" ]; then return 0 fi |