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

xbps-src: if build dependency cannot be resolved, exit with error.

Browse source
This commit is contained in:
Juan RP 2015-04-30 08:26:12 +02:00
parent f865501d4d
commit c6999a235d
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
common/xbps-src/shutils/build_dependencies.sh
View file

@ -1,7 +1,7 @@
# vim: set ts=4 sw=4 et: # vim: set ts=4 sw=4 et:
# #
setup_pkg_depends() { setup_pkg_depends() {
local pkg="$1" j _pkgdepname _pkgdep _rpkgname _depname _replacement local pkg="$1" j _pkgdepname _pkgdep _rpkgname _depname _depver _replacement
if [ -n "$pkg" ]; then if [ -n "$pkg" ]; then
# subpkg # subpkg
@ -53,7 +53,8 @@ setup_pkg_depends() {
_depname="${_depname/${_depname}/${_replacement}}" _depname="${_depname/${_depname}/${_replacement}}"
fi fi
fi fi
host_build_depends+=" ${_depname}-$(srcpkg_get_version ${_depname})" _depver=$(srcpkg_get_version ${_depname}) || exit $?
host_build_depends+=" ${_depname}-${_depver}"
done done
for j in ${makedepends}; do for j in ${makedepends}; do
_depname="${j%\?*}" _depname="${j%\?*}"
@ -68,7 +69,8 @@ setup_pkg_depends() {
_depname="${_depname/${_depname}/${_replacement}}" _depname="${_depname/${_depname}/${_replacement}}"
fi fi
fi fi
build_depends+=" ${_depname}-$(srcpkg_get_version ${_depname})" _depver=$(srcpkg_get_version ${_depname}) || exit $?
build_depends+=" ${_depname}-${_depver}"
done done
} }
@ -175,9 +177,9 @@ srcpkg_get_version() {
# Run this in a sub-shell to avoid polluting our env. # Run this in a sub-shell to avoid polluting our env.
( (
unset XBPS_BINPKG_EXISTS unset XBPS_BINPKG_EXISTS
setup_pkg $pkg || return $? setup_pkg $pkg || exit $?
echo "${version}_${revision}" echo "${version}_${revision}"
) || return $? ) || exit $?
} }
srcpkg_get_pkgver() { srcpkg_get_pkgver() {
@ -185,9 +187,9 @@ srcpkg_get_pkgver() {
# Run this in a sub-shell to avoid polluting our env. # Run this in a sub-shell to avoid polluting our env.
( (
unset XBPS_BINPKG_EXISTS unset XBPS_BINPKG_EXISTS
setup_pkg $pkg || return $? setup_pkg $pkg || exit $?
echo "${sourcepkg}-${version}_${revision}" echo "${sourcepkg}-${version}_${revision}"
) || return $? ) || exit $?
} }
# #