Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=ea12b1ab191d3d95898c9ef15586bc9ef4c31021
commit ea12b1ab191d3d95898c9ef15586bc9ef4c31021 Author: Michel Hermier <[email protected]> Date: Sat Nov 24 06:00:54 2012 +0100 scripts/makepkg * Cook makedepens just before they are used. diff --git a/scripts/makepkg b/scripts/makepkg index e5d7418..6c6435c 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -993,6 +993,14 @@ buildenv_depends_validate() { return 0 fi + local pkgname + + for pkgname in "${_P_package_names[@]}" + do + # _P_package_depends is not quoted on purpose + makedepends+=(${_P_package_depends["$pkgname"]}) + done + msg "Checking Buildtime Dependencies..." makedeplist="$(checkdeps "${makedepends[@]}")" handledeps $makedeplist @@ -1883,15 +1891,6 @@ if [ -z "$CACHEURL" ]; then CACHEURL="${serverlist}/source/$groups/$pkgname" fi -if [ ! -z "$subpkgs" ]; then - makedepends=${makedepends[@]} - for i in $(seq 0 $((${#subpkgs[@]} - 1))) - do - makedepends="$makedepends ${subdepends[$i]}" - done - makedepends=( $makedepends ) -fi - # You have to declare associative array before using them :/ declare -A \ _P_package_descriptions \ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
