|
@@ -676,13 +676,10 @@ disable_sanitized(){
|
|
|
do_enable_deep(){
|
|
|
for var; do
|
|
|
enabled $var && continue
|
|
|
- eval sel="\$${var}_select"
|
|
|
- eval sgs="\$${var}_suggest"
|
|
|
- pushvar var sgs
|
|
|
- enable_deep $sel
|
|
|
- popvar sgs
|
|
|
- enable_deep_weak $sgs
|
|
|
- popvar var
|
|
|
+ set -- $var
|
|
|
+ eval enable_deep \$${var}_select
|
|
|
+ var=$1
|
|
|
+ eval enable_deep_weak \$${var}_suggest
|
|
|
done
|
|
|
}
|
|
|
|
|
@@ -694,9 +691,9 @@ enable_deep(){
|
|
|
enable_deep_weak(){
|
|
|
for var; do
|
|
|
disabled $var && continue
|
|
|
- pushvar var
|
|
|
+ set -- $var
|
|
|
do_enable_deep $var
|
|
|
- popvar var
|
|
|
+ var=$1
|
|
|
enable_weak $var
|
|
|
done
|
|
|
}
|
|
@@ -756,40 +753,49 @@ is_in(){
|
|
|
return 1
|
|
|
}
|
|
|
|
|
|
+# The cfg loop is very hot (several thousands iterations), and in bash also
|
|
|
+# potentialy quite slow. Try to abort the iterations early, preferably without
|
|
|
+# calling functions. 70%+ of the time cfg is already done or without deps.
|
|
|
check_deps(){
|
|
|
for cfg; do
|
|
|
- enabled ${cfg}_checking && die "Circular dependency for $cfg."
|
|
|
- disabled ${cfg}_checking && continue
|
|
|
- enable ${cfg}_checking
|
|
|
-
|
|
|
- eval dep_all="\$${cfg}_deps"
|
|
|
- eval dep_any="\$${cfg}_deps_any"
|
|
|
- eval dep_con="\$${cfg}_conflict"
|
|
|
- eval dep_sel="\$${cfg}_select"
|
|
|
- eval dep_sgs="\$${cfg}_suggest"
|
|
|
- eval dep_ifa="\$${cfg}_if"
|
|
|
- eval dep_ifn="\$${cfg}_if_any"
|
|
|
-
|
|
|
- pushvar cfg dep_all dep_any dep_con dep_sel dep_sgs dep_ifa dep_ifn
|
|
|
- check_deps $dep_all $dep_any $dep_con $dep_sel $dep_sgs $dep_ifa $dep_ifn
|
|
|
- popvar cfg dep_all dep_any dep_con dep_sel dep_sgs dep_ifa dep_ifn
|
|
|
-
|
|
|
- [ -n "$dep_ifa" ] && { enabled_all $dep_ifa && enable_weak $cfg; }
|
|
|
- [ -n "$dep_ifn" ] && { enabled_any $dep_ifn && enable_weak $cfg; }
|
|
|
- enabled_all $dep_all || { disable $cfg && requested $cfg && die "ERROR: $cfg requested, but not all dependencies are satisfied: $dep_all"; }
|
|
|
- enabled_any $dep_any || { disable $cfg && requested $cfg && die "ERROR: $cfg requested, but not any dependency is satisfied: $dep_any"; }
|
|
|
- disabled_all $dep_con || { disable $cfg && requested $cfg && die "ERROR: $cfg requested, but some conflicting dependencies are unsatisfied: $dep_con"; }
|
|
|
- disabled_any $dep_sel && { disable $cfg && requested $cfg && die "ERROR: $cfg requested, but some selected dependency is unsatisfied: $dep_sel"; }
|
|
|
-
|
|
|
- enabled $cfg && enable_deep_weak $dep_sel $dep_sgs
|
|
|
-
|
|
|
- for dep in $dep_all $dep_any $dep_sel $dep_sgs; do
|
|
|
- # filter out library deps, these do not belong in extralibs
|
|
|
- is_in $dep $LIBRARY_LIST && continue
|
|
|
- enabled $dep && eval append ${cfg}_extralibs ${dep}_extralibs
|
|
|
- done
|
|
|
+ eval [ x\$${cfg}_checking = xdone ] && continue
|
|
|
+ eval [ x\$${cfg}_checking = xinprogress ] && die "Circular dependency for $cfg."
|
|
|
+
|
|
|
+ eval "
|
|
|
+ dep_all=\$${cfg}_deps
|
|
|
+ dep_any=\$${cfg}_deps_any
|
|
|
+ dep_con=\$${cfg}_conflict
|
|
|
+ dep_sel=\$${cfg}_select
|
|
|
+ dep_sgs=\$${cfg}_suggest
|
|
|
+ dep_ifa=\$${cfg}_if
|
|
|
+ dep_ifn=\$${cfg}_if_any
|
|
|
+ "
|
|
|
+
|
|
|
+ # most of the time here $cfg has no deps - avoid costly no-op work
|
|
|
+ if [ "$dep_all$dep_any$dep_con$dep_sel$dep_sgs$dep_ifa$dep_ifn" ]; then
|
|
|
+ eval ${cfg}_checking=inprogress
|
|
|
+
|
|
|
+ set -- $cfg "$dep_all" "$dep_any" "$dep_con" "$dep_sel" "$dep_sgs" "$dep_ifa" "$dep_ifn"
|
|
|
+ check_deps $dep_all $dep_any $dep_con $dep_sel $dep_sgs $dep_ifa $dep_ifn
|
|
|
+ cfg=$1; dep_all=$2; dep_any=$3; dep_con=$4; dep_sel=$5 dep_sgs=$6; dep_ifa=$7; dep_ifn=$8
|
|
|
+
|
|
|
+ [ -n "$dep_ifa" ] && { enabled_all $dep_ifa && enable_weak $cfg; }
|
|
|
+ [ -n "$dep_ifn" ] && { enabled_any $dep_ifn && enable_weak $cfg; }
|
|
|
+ enabled_all $dep_all || { disable $cfg && requested $cfg && die "ERROR: $cfg requested, but not all dependencies are satisfied: $dep_all"; }
|
|
|
+ enabled_any $dep_any || { disable $cfg && requested $cfg && die "ERROR: $cfg requested, but not any dependency is satisfied: $dep_any"; }
|
|
|
+ disabled_all $dep_con || { disable $cfg && requested $cfg && die "ERROR: $cfg requested, but some conflicting dependencies are unsatisfied: $dep_con"; }
|
|
|
+ disabled_any $dep_sel && { disable $cfg && requested $cfg && die "ERROR: $cfg requested, but some selected dependency is unsatisfied: $dep_sel"; }
|
|
|
+
|
|
|
+ enabled $cfg && enable_deep_weak $dep_sel $dep_sgs
|
|
|
+
|
|
|
+ for dep in $dep_all $dep_any $dep_sel $dep_sgs; do
|
|
|
+ # filter out library deps, these do not belong in extralibs
|
|
|
+ is_in $dep $LIBRARY_LIST && continue
|
|
|
+ enabled $dep && eval append ${cfg}_extralibs ${dep}_extralibs
|
|
|
+ done
|
|
|
+ fi
|
|
|
|
|
|
- disable ${cfg}_checking
|
|
|
+ eval ${cfg}_checking=done
|
|
|
done
|
|
|
}
|
|
|
|