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

xbps-src: make -N -a <target> work.

Browse source 
If required cross pkgs are not available in xbps repos, those are now built
automagically.
This commit is contained in:
Juan RP 2015-03-23 12:42:35 +01:00
parent a8549d6fb4
commit 03ef5b6804
4 changed files with 76 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,8 +7,9 @@
# $2 - target pkgname (origin) to build [REQUIRED]
# $3 - xbps target [REQUIRED]
# $4 - cross target [OPTIONAL]
# $5 - internal [OPTIONAL]
if [ $# -lt 3 -o $# -gt 4 ]; then
if [ $# -lt 3 -o $# -gt 5 ]; then
echo "$(basename $0): invalid number of arguments: pkgname targetpkg target [cross-target]"
exit 1
fi
@ -17,6 +18,7 @@ readonly PKGNAME="$1"
readonly TARGET_PKG="$2"
readonly TARGET="$3"
readonly XBPS_CROSS_BUILD="$4"
readonly XBPS_CROSS_PREPARE="$5"
for f in $XBPS_SHUTILSDIR/*.sh; do
. $f
@ -25,11 +27,15 @@ done
setup_pkg "$PKGNAME" $XBPS_CROSS_BUILD
show_pkg_build_options
check_pkg_arch $XBPS_CROSS_BUILD
install_cross_pkg $XBPS_CROSS_BUILD
if [ -z "$XBPS_CROSS_PREPARE" ]; then
install_cross_pkg $XBPS_CROSS_BUILD || exit $?
prepare_cross_sysroot $XBPS_CROSS_BUILD || exit $?
fi
# Install dependencies from binary packages
if [ "$PKGNAME" != "$TARGET_PKG" -o -z "$XBPS_SKIP_DEPS" ]; then
install_pkg_deps $PKGNAME $TARGET_PKG pkg $XBPS_CROSS_BUILD || exit $?
install_pkg_deps $PKGNAME $TARGET_PKG pkg $XBPS_CROSS_BUILD $XBPS_CROSS_PREPARE || exit $?
fi
# Fetch distfiles after installing required dependencies,