oneechanhax/abuild
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

abuild: allow circular makedepends

Browse Source 
Some packages like gcc-gnat needs bootstrapping. We need to allow
circular makedepends so we can specify gcc-gnat as makedepends for gcc.
This commit is contained in:
Natanael Copa 2013-09-10 13:02:01 +00:00
parent a2bab13656
commit dd3643574f
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
abuild.in
View File

@ -1536,16 +1536,19 @@ builddeps() {
# add depends unless it is a subpackage or package itself # add depends unless it is a subpackage or package itself
if cross_compiling && [ -n "$makedepends_build" -o -n "$makedepends_host" ]; then 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 [ "$pkgname" = "${i%%[<>=]*}" ] && continue
subpackages_has ${i%%[<>=]*} || builddeps="$builddeps $i" subpackages_has ${i%%[<>=]*} || builddeps="$builddeps $i"
done done
for i in $depends $makedepends_host; do hostdeps="$makedepends_host"
for i in $depends; do
[ "$pkgname" = "${i%%[<>=]*}" ] && continue [ "$pkgname" = "${i%%[<>=]*}" ] && continue
subpackages_has ${i%%[<>=]*} || hostdeps="$hostdeps $i" subpackages_has ${i%%[<>=]*} || hostdeps="$hostdeps $i"
done done
else else
for i in $BUILD_BASE $depends $makedepends; do builddeps="$makedepends"
for i in $BUILD_BASE $depends; do
[ "$pkgname" = "${i%%[<>=]*}" ] && continue [ "$pkgname" = "${i%%[<>=]*}" ] && continue
subpackages_has ${i%%[<>=]*} || builddeps="$builddeps $i" subpackages_has ${i%%[<>=]*} || builddeps="$builddeps $i"
done done