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

common/hooks: ignore XBPS_ARCH when cross building.

Browse Source
This commit is contained in:
Juan RP
2014-04-28 15:08:44 +02:00
parent ee5214433e
commit 9ffc0d09ce
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/hooks/do-pkg/00-gen-pkg.sh
View File

@@ -121,7 +121,7 @@ hook() {
else else
arch=$XBPS_MACHINE arch=$XBPS_MACHINE
fi fi
if [ -z "$noarch" -a -n "$XBPS_ARCH" -a "$XBPS_ARCH" != "$XBPS_TARGET_MACHINE" ]; then if [ -z "$noarch" -a -z "$XBPS_CROSS_BUILD" -a -n "$XBPS_ARCH" -a "$XBPS_ARCH" != "$XBPS_TARGET_MACHINE" ]; then
arch=${XBPS_ARCH} arch=${XBPS_ARCH}
fi fi

2
common/hooks/post-pkg/00-register-pkg.sh
View File

@@ -30,7 +30,7 @@ hook() {
else else
arch=$XBPS_MACHINE arch=$XBPS_MACHINE
fi fi
if [ -z "$noarch" -a -n "$XBPS_ARCH" -a "$XBPS_ARCH" != "$XBPS_TARGET_MACHINE" ]; then if [ -z "$noarch" -a -z "$XBPS_CROSS_BUILD" -a -n "$XBPS_ARCH" -a "$XBPS_ARCH" != "$XBPS_TARGET_MACHINE" ]; then
arch=${XBPS_ARCH} arch=${XBPS_ARCH}
fi fi
if [ -n "$nonfree" ]; then if [ -n "$nonfree" ]; then