[tor-commits] [torbrowser/maint-2.4] disable optimizations in the 64-bit Firefox build and update changelogs for new release of 64-bit TBBs

[erinn at torproject.org]

commit 428a55007f1785aa58642ed34893cd87abd06365
Author: Erinn Clark <erinn at torproject.org>
Date:   Wed Nov 20 17:53:04 2013 -0200

    disable optimizations in the 64-bit Firefox build and update changelogs for new release of 64-bit TBBs
---
 build-scripts/config/mozconfig-lin-x86_64 |    2 +-
 build-scripts/linux-alpha.mk              |    2 +-
 build-scripts/linux.mk                    |    2 +-
 changelog.linux-2.3                       |    7 +++++++
 changelog.linux-2.4                       |    7 +++++++
 5 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/build-scripts/config/mozconfig-lin-x86_64 b/build-scripts/config/mozconfig-lin-x86_64
index e71d8d2..4421981 100755
--- a/build-scripts/config/mozconfig-lin-x86_64
+++ b/build-scripts/config/mozconfig-lin-x86_64
@@ -6,7 +6,7 @@ mk_add_options MOZ_MAKE_FLAGS="-s --no-print-directory -j2"
 mk_add_options MOZILLA_OFFICIAL=1
 mk_add_options BUILD_OFFICIAL=1
 
-ac_add_options --enable-optimize
+ac_add_options --disable-optimize
 ac_add_options --enable-official-branding
 ac_add_options --enable-strip
 ac_add_options --disable-tests
diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk
index 3f831dd..349d512 100644
--- a/build-scripts/linux-alpha.mk
+++ b/build-scripts/linux-alpha.mk
@@ -15,7 +15,7 @@
 
 ## Architecture
 ARCH_TYPE=$(shell uname -m)
-BUILD_NUM=1
+BUILD_NUM=2
 PLATFORM=Linux
 
 ## Build machine specific settings
diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk
index 52e6c3b..9edc7ac 100644
--- a/build-scripts/linux.mk
+++ b/build-scripts/linux.mk
@@ -15,7 +15,7 @@
 
 ## Architecture
 ARCH_TYPE=$(shell uname -m)
-BUILD_NUM=15
+BUILD_NUM=16
 PLATFORM=Linux
 
 ## Build machine specific settings
diff --git a/changelog.linux-2.3 b/changelog.linux-2.3
index 8156ccc..1f70f46 100644
--- a/changelog.linux-2.3
+++ b/changelog.linux-2.3
@@ -1,3 +1,10 @@
+Tor Browser Bundle (2.3.25-16); suite=linux
+
+  * Update 64-bit Linux's mozconfig to --disable-optimize so Tor Browser will
+    stop crashing (closes: #10195)
+
+ -- Erinn Clark <erinn at torproject.org>  Wed Nov 20 17:46:24 BRST 2013
+
 Tor Browser Bundle (2.3.25-15); suite=linux
 
   * Update Firefox to 17.0.11esr
diff --git a/changelog.linux-2.4 b/changelog.linux-2.4
index 1b0f2d5..f3623e4 100644
--- a/changelog.linux-2.4
+++ b/changelog.linux-2.4
@@ -1,3 +1,10 @@
+Tor Browser Bundle (2.4.18-rc-2); suite=linux
+
+  * Update 64-bit Linux's mozconfig to --disable-optimize so Tor Browser will
+    stop crashing (closes: #10195)
+
+ -- Erinn Clark <erinn at torproject.org>  Wed Nov 20 17:46:24 BRST 2013
+
 Tor Browser Bundle (2.4.18-rc-1); suite=linux
 
   * Update Tor to 0.2.4.18-rc