From: Travis Cross <tc@traviscross.com>
Date: Tue, 8 May 2012 18:55:44 +0000 (+0000)
Subject: don't use bootstrap.sh -j anywhere but devel-bootstrap.sh
X-Git-Tag: v1.2.0~493
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb90d52df7cdda00668fc1706536d4347475e161;p=thirdparty%2Ffreeswitch.git

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 5581ffdacf..0cc293a346 100755
--- 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 a56dd90035..470866ab2c 100644
--- 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 25fd27a5e2..3aa6bb3441 100755
--- 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