jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

xbps-src: make i686 masterdirs (glibc) work on x86_64/musl hosts.

Browse source
This commit is contained in:
Juan RP 2016-04-13 08:07:02 +02:00
parent 3444e9ae58
commit 561ab61608
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
xbps-src
View file

@ -535,12 +535,13 @@ if [ -f $XBPS_MASTERDIR/.xbps_chroot_init ]; then
export CHROOT_READY=1 export CHROOT_READY=1
fi fi
if [ -s $XBPS_MASTERDIR/.xbps_chroot_init ]; then if [ -z "$XBPS_REINIT" -a -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)
if [ "$XBPS_MACHINE" = "x86_64" -a "$XBPS_ARCH" = "i686" -a -z "$IN_CHROOT" ]; then if [[ $XBPS_MACHINE == x86_64* ]] && [[ $XBPS_ARCH == i686* ]]; 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
# reexec itself via linux32 # reexec itself via linux32
export XBPS_REINIT=1
exec linux32 $0 ${XBPS_OPTIONS} $@ exec linux32 $0 ${XBPS_OPTIONS} $@
fi fi
fi fi