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

xbps-src: install cross pkg after checking dependencies.

Browse source 
... this should help buildbot a bit more.
This commit is contained in:
Juan RP 2019-07-10 21:07:16 +02:00
parent 19209587be
commit b79077c930
No known key found for this signature in database
GPG key ID: AF19F6CB482F9368
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -43,6 +43,10 @@ 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 [ "$XBPS_CROSS_BUILD" ]; then
install_cross_pkg $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

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

@ -54,8 +54,6 @@ prepare_cross_sysroot() {
ln -s usr/include ${XBPS_CROSS_BASE}/include ln -s usr/include ${XBPS_CROSS_BASE}/include
ln -s usr/lib ${XBPS_CROSS_BASE}/lib ln -s usr/lib ${XBPS_CROSS_BASE}/lib
install_cross_pkg $cross || return 1
touch -f $statefile touch -f $statefile
return 0 return 0