don't use bootstrap.sh -j anywhere but devel-bootstrap.sh

We believe there may be a race condition in bootstrap.sh when run with
-j.  We know that running it without -j should be at least
deterministic (whether or not correct), so we'll go with that in
anticipation of releasing v1.2.

diff --git a/debian/rules b/debian/rules
index 5581ffdacf5fc7c76b11ece9cafd6486d6f04759..0cc293a3465dae3b205ebbdf32056a268c3c7b93 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -47,7 +47,7 @@ override_dh_auto_clean:
 
 .stamp-bootstrap:
        @$(call show_vars)
-       ./bootstrap.sh -j
+       ./bootstrap.sh
        touch $@
 
 .stamp-configure: .stamp-bootstrap

diff --git a/freeswitch.spec b/freeswitch.spec
index a56dd90035d31c9220dbbdcd9cdc2c92805011f6..470866ab2cd76c1047389883c189ebf94b4a1737 100644 (file)
--- a/freeswitch.spec
+++ b/freeswitch.spec
@@ -1433,7 +1433,7 @@ export ACLOCAL_FLAGS="-I /usr/share/aclocal"
 
 if test ! -f Makefile.in 
 then 
-   ./bootstrap.sh -j
+   ./bootstrap.sh
 fi
 
 %configure -C \

diff --git a/scripts/ci/common.sh b/scripts/ci/common.sh
index 25fd27a5e2c53e7c50e11d7f81d52311dc2a3e8b..3aa6bb3441b8aa546f635a1003d7c75368af1b15 100755 (executable)
--- a/scripts/ci/common.sh
+++ b/scripts/ci/common.sh
@@ -112,7 +112,7 @@ set_fs_ver () {
 }
 
 gnuize () {
-  ./bootstrap.sh -j
+  ./bootstrap.sh
   mv bootstrap.sh rebootstrap.sh
   rm -f docs/AUTHORS
   rm -f docs/COPYING