bootstrap.sh: wait better
Be more explicit about what we're waiting for, among other changes. This appears to fully correct the wait issues.
This commit is contained in:
parent
76c0201e89
commit
89c590cda8
19
bootstrap.sh
19
bootstrap.sh
|
@ -438,10 +438,16 @@ bootstrap_libs_post() {
|
||||||
}
|
}
|
||||||
|
|
||||||
bootstrap_libs() {
|
bootstrap_libs() {
|
||||||
|
local jobs=""
|
||||||
for i in ${SUBDIRS}; do
|
for i in ${SUBDIRS}; do
|
||||||
case "$i" in
|
case "$i" in
|
||||||
apr|fs|libzrtp)
|
apr|fs|libzrtp)
|
||||||
${BGJOB} && wait
|
if ${BGJOB}; then
|
||||||
|
for x in $jobs; do
|
||||||
|
wait $jobs
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
jobs=""
|
||||||
bootstrap_$i
|
bootstrap_$i
|
||||||
continue
|
continue
|
||||||
;;
|
;;
|
||||||
|
@ -450,10 +456,16 @@ bootstrap_libs() {
|
||||||
if ! ${BGJOB}; then
|
if ! ${BGJOB}; then
|
||||||
libbootstrap ${i} ; bootstrap_libs_post ${i}
|
libbootstrap ${i} ; bootstrap_libs_post ${i}
|
||||||
else
|
else
|
||||||
((libbootstrap ${i} ; bootstrap_libs_post ${i}) &)
|
(libbootstrap ${i} ; bootstrap_libs_post ${i}) &
|
||||||
|
local x=$!
|
||||||
|
jobs="$jobs $x"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
${BGJOB} && wait
|
if ${BGJOB}; then
|
||||||
|
for x in $jobs; do
|
||||||
|
wait $x
|
||||||
|
done
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
run() {
|
run() {
|
||||||
|
@ -468,7 +480,6 @@ run() {
|
||||||
check_libtoolize
|
check_libtoolize
|
||||||
print_autotools_vers
|
print_autotools_vers
|
||||||
bootstrap_libs
|
bootstrap_libs
|
||||||
${BGJOB} && wait
|
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue