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

abuild: break circular deps when building recursively

Browse Source
This commit is contained in:
Natanael Copa 2010-05-06 21:02:07 +00:00
parent 92417870e6
commit 072e93458d
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
abuild.in
View File

@ -820,7 +820,7 @@ builddeps() {
if [ "${i#\!}" != "$i" ]; then if [ "${i#\!}" != "$i" ]; then
list_has ${i#\!} $installed_deps \ list_has ${i#\!} $installed_deps \
&& conflicts="$conflicts ${i#\!}" && conflicts="$conflicts ${i#\!}"
elif ! deplist_has $i $installed_deps; then elif ! deplist_has $i $installed_deps || [ -n "$upgrade" ]; then
missing="$missing $i" missing="$missing $i"
fi fi
done done
@ -863,11 +863,17 @@ builddeps() {
# i = pkg:dir # i = pkg:dir
local dir=${i#*:} local dir=${i#*:}
local pkg=${i%:*} local pkg=${i%:*}
if [ -d "$dir" ]; then
# ignore if dependency is in other repo
[ -d "$dir" ] || continue
# break cricular deps
list_has $pkg $ABUILD_VISITED && continue
export ABUILD_VISITED="$ABUILD_VISITED $pkg"
msg "Entering $dir" msg "Entering $dir"
cd "$dir" && $0 $forceroot $keep $quiet $install_deps \ cd "$dir" && $0 $forceroot $keep $quiet $install_deps \
$recursive $upgrade abuildindex || return 1 $recursive $upgrade abuildindex || return 1
fi
done done
$SUDO $APK add -u --repository "$abuildrepo" \ $SUDO $APK add -u --repository "$abuildrepo" \
--wait 30 \ --wait 30 \