Update the linux Instantbird mozconfigs for the migration to CentOS6 slaves, a=im/-only.
authorFlorian Quèze <florian@queze.net>
Thu, 24 Jul 2014 01:13:13 +0200
changeset 16591 b533b6092f82
parent 16590 f78f8897c4cc
child 16592 1b51a4f02a62
push id10316
push userflorian@queze.net
push dateWed, 23 Jul 2014 23:13:24 +0000
treeherdercomm-central@b533b6092f82 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersim, -only
Update the linux Instantbird mozconfigs for the migration to CentOS6 slaves, a=im/-only.
im/config/mozconfigs/linux/mozconfig
im/config/mozconfigs/linux/mozconfig-release
--- a/im/config/mozconfigs/linux/mozconfig
+++ b/im/config/mozconfigs/linux/mozconfig
@@ -1,12 +1,15 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+no_tooltool=1
+. $topsrcdir/build/unix/mozconfig.linux
+
 export MOZILLA_OFFICIAL=1
 mk_add_options MOZILLA_OFFICIAL=1
 
 export CFLAGS="-gdwarf-2 -Wno-sign-compare"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
@@ -16,22 +19,12 @@ mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 ac_add_options --with-ccache
 ac_add_options --enable-application=im
 ac_add_options --enable-extensions=purple
 ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-update-packaging
 ac_add_options --enable-optimize
 ac_add_options --disable-debug
-ac_add_options --disable-dbus
-ac_add_options --disable-necko-wifi
-ac_add_options --disable-elf-hack
-ac_add_options --disable-gio
-ac_add_options --enable-gnomevfs
-ac_add_options --disable-gstreamer
-ac_add_options --disable-pulseaudio
-
-# Avoid dependency on libstdc++ 4.7
-ac_add_options --enable-stdcxx-compat
 
 if [ `date +%m%d` = 1031 -o `date +%m%d` = 1101 ]; then
 ac_add_options --with-branding=instantbird/branding/halloween
 fi
--- a/im/config/mozconfigs/linux/mozconfig-release
+++ b/im/config/mozconfigs/linux/mozconfig-release
@@ -1,12 +1,15 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+no_tooltool=1
+. $topsrcdir/build/unix/mozconfig.linux
+
 export MOZILLA_OFFICIAL=1
 mk_add_options MOZILLA_OFFICIAL=1
 
 export CFLAGS="-gdwarf-2 -Wno-sign-compare"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
@@ -16,21 +19,11 @@ mk_add_options MOZ_MAKE_FLAGS="-j4"
 
 ac_add_options --with-ccache
 ac_add_options --enable-application=im
 ac_add_options --enable-extensions=purple
 ac_add_options --enable-update-channel=release
 ac_add_options --enable-update-packaging
 ac_add_options --enable-optimize
 ac_add_options --disable-debug
-ac_add_options --disable-dbus
-ac_add_options --disable-necko-wifi
-ac_add_options --disable-elf-hack
-ac_add_options --disable-gio
-ac_add_options --enable-gnomevfs
-ac_add_options --disable-gstreamer
-ac_add_options --disable-pulseaudio
-
-# Avoid dependency on libstdc++ 4.7
-ac_add_options --enable-stdcxx-compat
 
 ac_add_options --enable-official-branding
 ac_add_options --with-l10n-base=..