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

xbps-src: speed up cross compilation by installing cross pkgs a bit later.

Browse source
This commit is contained in:
Juan RP 2017-04-03 21:12:34 +02:00
parent 16558dcf18
commit d7aaa3e3e9
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
common/xbps-src/libexec/build.sh
View file

@ -32,10 +32,6 @@ readonly SOURCEPKG="$sourcepkg"
show_pkg_build_options show_pkg_build_options
check_pkg_arch $XBPS_CROSS_BUILD check_pkg_arch $XBPS_CROSS_BUILD
if [ -z "$XBPS_CROSS_PREPARE" ]; then
install_cross_pkg $XBPS_CROSS_BUILD || exit $?
prepare_cross_sysroot $XBPS_CROSS_BUILD || exit $?
fi
if [ -z "$XBPS_DEPENDENCY" -a -z "$XBPS_TEMP_MASTERDIR" -a -n "$XBPS_KEEP_ALL" -a "$XBPS_CHROOT_CMD" = "proot" ]; then if [ -z "$XBPS_DEPENDENCY" -a -z "$XBPS_TEMP_MASTERDIR" -a -n "$XBPS_KEEP_ALL" -a "$XBPS_CHROOT_CMD" = "proot" ]; then
remove_pkg_autodeps remove_pkg_autodeps
fi fi
@ -44,6 +40,11 @@ if [ "$PKGNAME" != "$XBPS_TARGET_PKG" -o -z "$XBPS_SKIP_DEPS" ]; then
install_pkg_deps $PKGNAME $XBPS_TARGET_PKG pkg $XBPS_CROSS_BUILD $XBPS_CROSS_PREPARE || exit $? install_pkg_deps $PKGNAME $XBPS_TARGET_PKG pkg $XBPS_CROSS_BUILD $XBPS_CROSS_PREPARE || exit $?
fi fi
if [ -z "$XBPS_CROSS_PREPARE" ]; then
install_cross_pkg $XBPS_CROSS_BUILD || exit $?
prepare_cross_sysroot $XBPS_CROSS_BUILD || exit $?
fi
# Fetch distfiles after installing required dependencies, # Fetch distfiles after installing required dependencies,
# because some of them might be required for do_fetch(). # because some of them might be required for do_fetch().
$XBPS_LIBEXECDIR/xbps-src-dofetch.sh $SOURCEPKG $XBPS_CROSS_BUILD || exit 1 $XBPS_LIBEXECDIR/xbps-src-dofetch.sh $SOURCEPKG $XBPS_CROSS_BUILD || exit 1