snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

xbps-src: properly set XBPS_MACHINE after linux32 reexec for x86 builds.

This commit is contained in:
Juan RP 2014-11-22 07:00:50 +01:00
parent d6d029db01
commit d1cfb341c2
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xbps-src
View File

@ -444,7 +444,6 @@ fi
if [ -s $XBPS_MASTERDIR/.xbps_chroot_init ]; then if [ -s $XBPS_MASTERDIR/.xbps_chroot_init ]; then
export XBPS_ARCH=$(cat $XBPS_MASTERDIR/.xbps_chroot_init) export XBPS_ARCH=$(cat $XBPS_MASTERDIR/.xbps_chroot_init)
export XBPS_MACHINE=$XBPS_ARCH
if [ "$XBPS_MACHINE" = "x86_64" -a "$XBPS_ARCH" = "i686" -a -z "$IN_CHROOT" ]; then if [ "$XBPS_MACHINE" = "x86_64" -a "$XBPS_ARCH" = "i686" -a -z "$IN_CHROOT" ]; then
# reconfigure pkgs via linux32 # reconfigure pkgs via linux32
linux32 xbps-reconfigure -r ${XBPS_MASTERDIR} -a &>/dev/null linux32 xbps-reconfigure -r ${XBPS_MASTERDIR} -a &>/dev/null
@ -452,6 +451,9 @@ if [ -s $XBPS_MASTERDIR/.xbps_chroot_init ]; then
exec linux32 $0 ${XBPS_OPTIONS} $@ exec linux32 $0 ${XBPS_OPTIONS} $@
fi fi
fi fi
if [ -n "$XBPS_ARCH" ]; then
export XBPS_MACHINE=$XBPS_ARCH
fi
export XBPS_SHUTILSDIR XBPS_CROSSPFDIR XBPS_TRIGGERSDIR \ export XBPS_SHUTILSDIR XBPS_CROSSPFDIR XBPS_TRIGGERSDIR \
XBPS_SRCPKGDIR XBPS_COMMONDIR XBPS_BUILDDIR XBPS_REPO_DELTAS \ XBPS_SRCPKGDIR XBPS_COMMONDIR XBPS_BUILDDIR XBPS_REPO_DELTAS \