moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

xbps-src: force reconfiguration of base-directories in sysroot.

Browse source 
... otherwise some required symlinks in sysroot aren't created, and this
seems to be required when cross compiling for i686.
This commit is contained in:
Juan RP 2015-04-15 12:23:07 +02:00
parent fbcf8c0694
commit 313cdf6ee6
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/environment/configure/gnu-configure-args.sh
View file

@ -19,10 +19,6 @@ if [ -z "$CROSS_BUILD" ]; then
return 0 return 0
fi fi
if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
ln -sf lib ${XBPS_CROSS_BASE}/usr/lib32
fi
export configure_args+=" --host=$XBPS_CROSS_TRIPLET --with-sysroot=$XBPS_CROSS_BASE --with-libtool-sysroot=$XBPS_CROSS_BASE " export configure_args+=" --host=$XBPS_CROSS_TRIPLET --with-sysroot=$XBPS_CROSS_BASE --with-libtool-sysroot=$XBPS_CROSS_BASE "
_AUTOCONFCACHEDIR=${XBPS_COMMONDIR}/environment/configure/autoconf_cache _AUTOCONFCACHEDIR=${XBPS_COMMONDIR}/environment/configure/autoconf_cache

2
common/xbps-src/shutils/cross.sh
View file

@ -47,6 +47,8 @@ prepare_cross_sysroot() {
msg_error "cannot continue due to errors above\n" msg_error "cannot continue due to errors above\n"
fi fi
rm -f $errlog rm -f $errlog
# Create top level symlinks in sysroot.
XBPS_ARCH=$XBPS_TARGET_ARCH xbps-reconfigure -r $XBPS_CROSS_BASE -f base-directories
return 0 return 0
} }