jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

xbps-src/build_dependencies: handle deps provided by vpkgs correctly.

Browse source 
... otherwise deps specified by the cross-vpkg-dummy pkg aren't
taken into account. Assume that version provided by the vpkg is
good enough for building.
This commit is contained in:
Juan RP 2015-03-28 03:22:07 +01:00
parent eaed8769eb
commit 7cffdb2d28
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -223,8 +223,15 @@ install_pkg_deps() {
echo " [host] ${i}: installed." echo " [host] ${i}: installed."
continue continue
elif [ $rval -eq 1 ]; then elif [ $rval -eq 1 ]; then
echo " [host] ${i}: unresolved (must be updated) ..." _realpkg="$($XBPS_UHELPER_CMD getpkgname $i 2>/dev/null)"
return 1 iver=$($XBPS_UHELPER_CMD version ${_realpkg})
if [ $? -eq 0 -a -n "$iver" ]; then
echo " [host] ${i}: installed $iver (virtualpkg)."
continue
else
echo " [host] ${i}: unresolved build dependency!"
return 1
fi
else else
repo=$($XBPS_QUERY_CMD -R -prepository ${i} 2>/dev/null) repo=$($XBPS_QUERY_CMD -R -prepository ${i} 2>/dev/null)
if [ -n "${repo}" ]; then if [ -n "${repo}" ]; then
@ -252,19 +259,25 @@ install_pkg_deps() {
check_pkgdep_matched "${i}" version $cross check_pkgdep_matched "${i}" version $cross
local rval=$? local rval=$?
if [ $rval -eq 0 ]; then if [ $rval -eq 0 ]; then
echo " [${rundep:-target}] ${i}: installed." echo " [target] ${i}: installed."
continue continue
elif [ $rval -eq 1 ]; then elif [ $rval -eq 1 ]; then
echo " [${rundep:-target}] ${i}: unresolved (must be updated) ..." iver=$($XBPS_UHELPER_XCMD version ${_realpkg})
return 1 if [ $? -eq 0 -a -n "$iver" ]; then
echo " [target] ${i}: installed $iver (virtualpkg)."
continue
else
echo " [target] ${i}: unresolved build dependency!"
return 1
fi
else else
repo=$($XBPS_QUERY_XCMD -R -prepository ${i} 2>/dev/null) repo=$($XBPS_QUERY_XCMD -R -prepository ${i} 2>/dev/null)
if [ -n "${repo}" ]; then if [ -n "${repo}" ]; then
echo " [${rundep:-target}] ${i}: found ($repo)" echo " [target] ${i}: found ($repo)"
binpkg_deps+=("${i}") binpkg_deps+=("${i}")
continue continue
else else
echo " [${rundep:-target}] ${i}: not found." echo " [target] ${i}: not found."
fi fi
fi fi
missing_deps+=("${i}") missing_deps+=("${i}")