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

xbps-src: simplify dbulk-dump output

Browse source 
* List dependencies of subpackages as part of the source packages
  dependencies, knowing the subpackage they are coming from does
  not matter to a build scheduler as long as xbps-src requires
  those to exist in the same way to main depends= have to exist.
* Resolve virtual? packages through existing means in xbps-src to
  avoid duplicating and possibly diverting from xbps-src's
  behaviour in tools that use dbulk-dump.
* Filter out dependencies on the template itself from sub packages,
  this matches the xbps-src behaviour and there is no need to
  have to duplicate logic for this into the scheduling tool.
* Error out on archs= restrictions as we do already on broken=
  and nocross=, there shouldn't be the need to discover archs=
  restrictions when attempting to build the package.
This commit is contained in:
Duncaen 2021-03-10 22:01:35 +01:00 • committed by Toyam Cox
parent e61630a65d
commit 1f6ab168de
3 changed files with 11 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -32,19 +32,18 @@ setup_pkg_depends() {
if [ -z "$foo" ]; then
msg_error "$pkgver: failed to resolve virtual dependency for '$j' (missing from etc/virtual)\n"
fi
_deps+="$foo "
[[ $out ]] && echo "$foo"
else
foo="$($XBPS_UHELPER_CMD getpkgdepname ${_depname} 2>/dev/null)"
if [ -z "$foo" ]; then
foo="$($XBPS_UHELPER_CMD getpkgname ${_depname} 2>/dev/null)"
[ -z "$foo" ] && foo="${_depname}"
fi
_deps+="$foo "
[[ $out ]] && echo "$foo"
fi
run_depends+="${_depname} "
done
[[ $out && $_deps ]] && echo "$_deps"
return 0
}