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

xbps-src: use "virtual?" keyword to declare virtual runtime dependencies.

Browse source 
The syntax "pkg?vpkg" can be used in hostmakedepends, makedepends and depends;
but the "virtual" keyword can be declared specifically for runtime dependencies
(depends).
This commit is contained in:
Juan RP 2014-08-17 19:21:25 +02:00
parent b4483f25c7
commit 9d50c2fb05
3 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
common/xbps-src/shutils/common.sh
View file

@ -391,7 +391,7 @@ setup_pkg() {
}
setup_pkg_depends() {
local pkg="$1" j _pkgdepname _pkgdep _depname
local pkg="$1" j _pkgdepname _pkgdep _rpkgname _depname
if [ -n "$pkg" ]; then
# subpkg
@ -401,6 +401,7 @@ setup_pkg_depends() {
fi
for j in ${depends}; do
_rpkgname="${j%\?*}"
_depname="${j#*\?}"
_pkgdepname="$($XBPS_UHELPER_CMD getpkgdepname ${_depname} 2>/dev/null)"
if [ -z "${_pkgdepname}" ]; then
@ -412,7 +413,11 @@ setup_pkg_depends() {
else
_pkgdep="${_depname}"
fi
run_depends+=" ${_pkgdep}"
if [ "${_rpkgname}" = "virtual" ]; then
run_depends+=" virtual?${_pkgdep}"
else
run_depends+=" ${_pkgdep}"
fi
done
for j in ${hostmakedepends}; do
_depname="${j%\?*}"