From 5313faabfdce5a03805839b4a4bb94f6fe63a9a4 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 21 Feb 2019 22:21:37 +0100 Subject: [PATCH] common: add compatibility code for noarch also for prepkg and doinstall --- common/xbps-src/libexec/xbps-src-doinstall.sh | 8 ++++++++ common/xbps-src/libexec/xbps-src-prepkg.sh | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/common/xbps-src/libexec/xbps-src-doinstall.sh b/common/xbps-src/libexec/xbps-src-doinstall.sh index b3d5d7276f8..af30e5ae5e2 100755 --- a/common/xbps-src/libexec/xbps-src-doinstall.sh +++ b/common/xbps-src/libexec/xbps-src-doinstall.sh @@ -53,6 +53,14 @@ if [ ! -f $XBPS_SUBPKG_INSTALL_DONE ]; then ${PKGNAME}_package pkgname=$PKGNAME + if [ -n "$noarch" ]; then + archs=noarch + unset noarch + fi + if [ -n "$only_for_archs" ]; then + archs="$only_for_archs" + unset only_for_archs + fi source_file $XBPS_COMMONDIR/environment/build-style/${build_style}.sh diff --git a/common/xbps-src/libexec/xbps-src-prepkg.sh b/common/xbps-src/libexec/xbps-src-prepkg.sh index 4be45fd0a14..abc8988ec40 100755 --- a/common/xbps-src/libexec/xbps-src-prepkg.sh +++ b/common/xbps-src/libexec/xbps-src-prepkg.sh @@ -40,6 +40,14 @@ if [ "$sourcepkg" != "$PKGNAME" ]; then ${PKGNAME}_package pkgname=$PKGNAME + if [ -n "$noarch" ]; then + archs=noarch + unset noarch + fi + if [ -n "$only_for_archs" ]; then + archs="$only_for_archs" + unset only_for_archs + fi fi source_file $XBPS_COMMONDIR/environment/build-style/${build_style}.sh