Bug 1047715 - Fix mozconfigs to allow building. r=Callek a=Callek over irc on a CLOSED TREE.
authorJustin Wood <Callek@gmail.com>
Tue, 12 Aug 2014 11:56:58 +0800
changeset 31086 410b041f4841ce233008f128f272d972993ee995
parent 31085 43b40be842ce6534528f54e47fa9b77f4e1c678d
child 31087 f29497549d0e087eedb410c71a7d06b60532af11
push id1
push userclokep@gmail.com
push dateMon, 07 May 2018 22:45:56 +0000
treeherdercomm-esr60@57eacde5ef40 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersCallek, Callek
bugs1047715
Bug 1047715 - Fix mozconfigs to allow building. r=Callek a=Callek over irc on a CLOSED TREE.
suite/config/mozconfigs/linux32/debug
suite/config/mozconfigs/linux32/l10n-mozconfig
suite/config/mozconfigs/linux32/nightly
suite/config/mozconfigs/linux32/release
suite/config/mozconfigs/linux32/release-l10n
suite/config/mozconfigs/linux64/l10n-mozconfig
suite/config/mozconfigs/linux64/nightly
suite/config/mozconfigs/linux64/release
suite/config/mozconfigs/linux64/release-l10n
suite/config/tooltool-manifests/linux32/releng.manifest
suite/config/tooltool-manifests/linux64/releng.manifest
--- a/suite/config/mozconfigs/linux32/debug
+++ b/suite/config/mozconfigs/linux32/debug
@@ -1,24 +1,23 @@
+no_tooltool=1
 . "$topsrcdir/build/mozconfig.common"
+. "$topsrcdir/build/unix/mozconfig.linux32"
 
 ac_add_options --enable-application=suite
 
 ac_add_options --enable-debug
 
 ac_add_options --enable-tests
 ac_add_options --enable-trace-malloc
 
 # Temporary options until bug 794378 is fixed
 ac_add_options --enable-gnomevfs
 ac_add_options --disable-gio
 
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
 export LDFLAGS="-static-libstdc++"
 export HOST_LDFLAGS="-static-libstdc++"
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
--- a/suite/config/mozconfigs/linux32/l10n-mozconfig
+++ b/suite/config/mozconfigs/linux32/l10n-mozconfig
@@ -1,23 +1,22 @@
+no_tooltool=1
 . "$topsrcdir/build/mozconfig.common"
+. "$topsrcdir/build/unix/mozconfig.linux32"
 
 ac_add_options --enable-application=suite
 ac_add_options --with-l10n-base=../../l10n-central
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-stdcxx-compat
 
 # Temporary options until bug 794378 is fixed
 ac_add_options --enable-gnomevfs
 ac_add_options --disable-gio
 
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
--- a/suite/config/mozconfigs/linux32/nightly
+++ b/suite/config/mozconfigs/linux32/nightly
@@ -1,25 +1,24 @@
+no_tooltool=1
 . "$topsrcdir/build/mozconfig.common"
+. "$topsrcdir/build/unix/mozconfig.linux32"
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-optimize
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-tests
 ac_add_options --enable-stdcxx-compat
 
 # Temporary options until bug 794378 is fixed
 ac_add_options --enable-gnomevfs
 ac_add_options --disable-gio
 
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
--- a/suite/config/mozconfigs/linux32/release
+++ b/suite/config/mozconfigs/linux32/release
@@ -1,25 +1,24 @@
+no_tooltool=1
 . "$topsrcdir/build/mozconfig.common"
+. "$topsrcdir/build/unix/mozconfig.linux32"
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-optimize
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-tests
 ac_add_options --enable-stdcxx-compat
 
 # Temporary options until bug 794378 is fixed
 ac_add_options --enable-gnomevfs
 ac_add_options --disable-gio
 
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
--- a/suite/config/mozconfigs/linux32/release-l10n
+++ b/suite/config/mozconfigs/linux32/release-l10n
@@ -1,25 +1,24 @@
+no_tooltool=1
 . "$topsrcdir/build/mozconfig.common"
+. "$topsrcdir/build/unix/mozconfig.linux32"
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-optimize
 ac_add_options --enable-stdcxx-compat
 
 
 # Temporary options until bug 794378 is fixed.
 ac_add_options --enable-gnomevfs
 ac_add_options --disable-gio
 
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
--- a/suite/config/mozconfigs/linux64/l10n-mozconfig
+++ b/suite/config/mozconfigs/linux64/l10n-mozconfig
@@ -1,23 +1,22 @@
+no_tooltool=1
 . "$topsrcdir/build/mozconfig.common"
+. "$topsrcdir/build/unix/mozconfig.linux"
 
 ac_add_options --enable-application=suite
 ac_add_options --with-l10n-base=../../l10n-central
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-stdcxx-compat
 
 # Temporary options until bug 794378 is fixed
 ac_add_options --enable-gnomevfs
 ac_add_options --disable-gio
 
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
 export LDFLAGS="-static-libstdc++"
 export HOST_LDFLAGS="-static-libstdc++"
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
--- a/suite/config/mozconfigs/linux64/nightly
+++ b/suite/config/mozconfigs/linux64/nightly
@@ -1,25 +1,24 @@
+no_tooltool=1
 . "$topsrcdir/build/mozconfig.common"
+. "$topsrcdir/build/unix/mozconfig.linux"
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-optimize
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-tests
 ac_add_options --enable-stdcxx-compat
 
 # Temporary options until bug 794378 is fixed
 ac_add_options --enable-gnomevfs
 ac_add_options --disable-gio
 
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
 export LDFLAGS="-DYUV_DISABLE_ASM=1"
 export CFLAGS="-gdwarf-2 -DYUV_DISABLE_ASM=1"
 export CXXFLAGS="-gdwarf-2 -DYUV_DISABLE_ASM=1"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
--- a/suite/config/mozconfigs/linux64/release
+++ b/suite/config/mozconfigs/linux64/release
@@ -1,25 +1,24 @@
+no_tooltool=1
 . "$topsrcdir/build/mozconfig.common"
+. "$topsrcdir/build/unix/mozconfig.linux"
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-optimize
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-tests
 ac_add_options --enable-stdcxx-compat
 
 # Temporary options until bug 794378 is fixed
 ac_add_options --enable-gnomevfs
 ac_add_options --disable-gio
 
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
 export LDFLAGS="-DYUV_DISABLE_ASM=1"
 export CFLAGS="-gdwarf-2 -DYUV_DISABLE_ASM=1"
 export CXXFLAGS="-gdwarf-2 -DYUV_DISABLE_ASM=1"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
--- a/suite/config/mozconfigs/linux64/release-l10n
+++ b/suite/config/mozconfigs/linux64/release-l10n
@@ -1,20 +1,19 @@
+no_tooltool=1
 . "$topsrcdir/build/mozconfig.common"
+. "$topsrcdir/build/unix/mozconfig.linux"
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-application=suite
 ac_add_options --enable-optimize
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-stdcxx-compat
 
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
--- a/suite/config/tooltool-manifests/linux32/releng.manifest
+++ b/suite/config/tooltool-manifests/linux32/releng.manifest
@@ -1,1 +1,14 @@
-[]
+[
+{
+"size": 42,
+"digest": "cde14faff5bf41d92367f1982d840cb950b3acb9b299326ba5727afada1b9af6c649f81763cd9d7ad6c945d708a1b60fb93c5f247012838083225d78e100a21b",
+"algorithm": "sha512", 
+"filename": "setup.sh"
+}, 
+{
+"size": 80458572,
+"digest": "e5101f9dee1e462f6cbd3897ea57eede41d23981825c7b20d91d23ab461875d54d3dfc24999aa58a31e8b01f49fb3140e05ffe5af2957ef1d1afb89fd0dfe1ad",
+"algorithm": "sha512", 
+"filename": "gcc.tar.xz"
+}
+]
--- a/suite/config/tooltool-manifests/linux64/releng.manifest
+++ b/suite/config/tooltool-manifests/linux64/releng.manifest
@@ -1,1 +1,14 @@
-[]
+[
+{
+"size": 42,
+"digest": "cde14faff5bf41d92367f1982d840cb950b3acb9b299326ba5727afada1b9af6c649f81763cd9d7ad6c945d708a1b60fb93c5f247012838083225d78e100a21b",
+"algorithm": "sha512", 
+"filename": "setup.sh"
+}, 
+{
+"size": 80458572,
+"digest": "e5101f9dee1e462f6cbd3897ea57eede41d23981825c7b20d91d23ab461875d54d3dfc24999aa58a31e8b01f49fb3140e05ffe5af2957ef1d1afb89fd0dfe1ad",
+"algorithm": "sha512", 
+"filename": "gcc.tar.xz"
+}
+]