tomcharnock/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

common: add compatibility code for noarch also for prepkg and doinstall

Browse Source
This commit is contained in:
John
2019-02-21 22:21:37 +01:00
committed by John Zimmermann
parent 121b4cfba1
commit 5313faabfd
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/xbps-src/libexec/xbps-src-doinstall.sh
View File

@@ -53,6 +53,14 @@ if [ ! -f $XBPS_SUBPKG_INSTALL_DONE ]; then
${PKGNAME}_package ${PKGNAME}_package
pkgname=$PKGNAME 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 source_file $XBPS_COMMONDIR/environment/build-style/${build_style}.sh

8
common/xbps-src/libexec/xbps-src-prepkg.sh
View File

@@ -40,6 +40,14 @@ if [ "$sourcepkg" != "$PKGNAME" ]; then
${PKGNAME}_package ${PKGNAME}_package
pkgname=$PKGNAME 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 fi
source_file $XBPS_COMMONDIR/environment/build-style/${build_style}.sh source_file $XBPS_COMMONDIR/environment/build-style/${build_style}.sh