teldra/vp-build
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xbps-src: fix previous (prepare_cross_sysroot needs to be run early).

Browse Source
This commit is contained in:
Juan RP 2017-04-03 21:16:51 +02:00
parent d7aaa3e3e9
commit 36480319fe
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/xbps-src/libexec/build.sh
View File

@ -32,6 +32,9 @@ 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
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
@ -42,7 +45,6 @@ fi
if [ -z "$XBPS_CROSS_PREPARE" ]; then if [ -z "$XBPS_CROSS_PREPARE" ]; then
install_cross_pkg $XBPS_CROSS_BUILD || exit $? install_cross_pkg $XBPS_CROSS_BUILD || exit $?
prepare_cross_sysroot $XBPS_CROSS_BUILD || exit $?
fi fi
# Fetch distfiles after installing required dependencies, # Fetch distfiles after installing required dependencies,