xbps-src: speed up cross compilation by installing cross pkgs a bit later.
This commit is contained in:
parent
16558dcf18
commit
d7aaa3e3e9
|
@ -32,10 +32,6 @@ readonly SOURCEPKG="$sourcepkg"
|
|||
show_pkg_build_options
|
||||
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
|
||||
remove_pkg_autodeps
|
||||
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 $?
|
||||
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,
|
||||
# because some of them might be required for do_fetch().
|
||||
$XBPS_LIBEXECDIR/xbps-src-dofetch.sh $SOURCEPKG $XBPS_CROSS_BUILD || exit 1
|
||||
|
|
Loading…
Reference in New Issue