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

Added support for extended pkgdep version matching.

Browse source 
xbps from launchpad head branch has gained support for extended
pkg version matching, as specified in:

https://blueprints.launchpad.net/xbps/+spec/improved-version-matching

Now it's required to specify the operator(s) for required versions
in the depends files and "Add_dependency" option in build templates.

xbps-src now requires xbps utils 20091107.

--HG--
extra : convert_revision : fc09fa707483a75e0b6f68445721fc1a9166cdad
This commit is contained in:
Juan RP 2009-11-07 05:01:00 +01:00
parent 81274224e0
commit 2c53035fb7
187 changed files with 558 additions and 529 deletions
Download patch file Download diff file Expand all files Collapse all files

34
xbps-src/shutils/tmpl_funcs.sh
View file

@ -115,38 +115,38 @@ setup_tmpl()
Add_dependency()
{
local type="$1"
local pkgname="$2"
local minver="$3"
local type="$1" pkgname="$2" version="$3"
case "$type" in
build|full|run) ;;
*) msg_error "Unknown dependency type for $pkgname." ;;
esac
if [ -f $XBPS_TEMPLATESDIR/$pkgname/$pkgname.depends ]; then
. $XBPS_TEMPLATESDIR/$pkgname/$pkgname.depends
elif [ -f $XBPS_TEMPLATESDIR/$pkgname/depends ]; then
. $XBPS_TEMPLATESDIR/$pkgname/depends
[ -z "$pkgname" ] && msg_error "Add_dependency: pkgname empty!"
if [ -f $XBPS_TEMPLATESDIR/${pkgname}/${pkgname}.depends ]; then
. $XBPS_TEMPLATESDIR/${pkgname}/${pkgname}.depends
elif [ -f $XBPS_TEMPLATESDIR/${pkgname}/depends ]; then
. $XBPS_TEMPLATESDIR/${pkgname}/depends
fi
if [ "$type" = "full" -o "$type" = "build" ]; then
if [ -z "$minver" -a -z "$api_depends" ]; then
build_depends="${build_depends} $pkgname-0"
elif [ -z "$minver" -a -n "$api_depends" ]; then
build_depends="${build_depends} $pkgname-$api_depends"
if [ -z "$version" -a -z "$api_depends" ]; then
build_depends="${build_depends} ${pkgname}>=0"
elif [ -z "$version" -a -n "$api_depends" ]; then
build_depends="${build_depends} ${pkgname}${api_depends}"
else
build_depends="${build_depends} $pkgname-$minver"
build_depends="${build_depends} ${pkgname}${version}"
fi
fi
if [ "$type" = "full" -o "$type" = "run" ]; then
if [ -z "$minver" -a -z "$abi_depends" ]; then
run_depends="${run_depends} $pkgname-0"
elif [ -z "$minver" -a -n "$abi_depends" ]; then
run_depends="${run_depends} $pkgname-$abi_depends"
if [ -z "$version" -a -z "$abi_depends" ]; then
run_depends="${run_depends} ${pkgname}>=0"
elif [ -z "$version" -a -n "$abi_depends" ]; then
run_depends="${run_depends} ${pkgname}${abi_depends}"
else
run_depends="${run_depends} $pkgname-$minver"
run_depends="${run_depends} ${pkgname}${version}"
fi
fi