From dd3643574f4f7764aa195c927e8652bfd15b984f Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Tue, 10 Sep 2013 13:02:01 +0000 Subject: abuild: allow circular makedepends Some packages like gcc-gnat needs bootstrapping. We need to allow circular makedepends so we can specify gcc-gnat as makedepends for gcc. --- abuild.in | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/abuild.in b/abuild.in index 5405d5a..aeda072 100755 --- a/abuild.in +++ b/abuild.in @@ -1536,16 +1536,19 @@ builddeps() { # add depends unless it is a subpackage or package itself if cross_compiling && [ -n "$makedepends_build" -o -n "$makedepends_host" ]; then - for i in $BUILD_BASE $makedepends_build; do + builddeps="$makedepends_build" + for i in $BUILD_BASE; do [ "$pkgname" = "${i%%[<>=]*}" ] && continue subpackages_has ${i%%[<>=]*} || builddeps="$builddeps $i" done - for i in $depends $makedepends_host; do + hostdeps="$makedepends_host" + for i in $depends; do [ "$pkgname" = "${i%%[<>=]*}" ] && continue subpackages_has ${i%%[<>=]*} || hostdeps="$hostdeps $i" done else - for i in $BUILD_BASE $depends $makedepends; do + builddeps="$makedepends" + for i in $BUILD_BASE $depends; do [ "$pkgname" = "${i%%[<>=]*}" ] && continue subpackages_has ${i%%[<>=]*} || builddeps="$builddeps $i" done -- cgit v1.2.3-60-g2f50