Bug 1385543 - Disable stylo building on all platforms for SeaMonkey. r=IanN
authorFrank-Rainer Grahl <frgrahl@gmx.net>
Sun, 30 Jul 2017 21:31:34 +0200
changeset 28522 19ffaeb8c4a027aae028f0dfafc160ed7a3b3c93
parent 28521 6a2729aebec1a43258690cb8aa199b6a92e2da4a
child 28523 d72296afe377924325621557c9cf1d765957e5d6
push id1986
push userclokep@gmail.com
push dateWed, 02 Aug 2017 14:43:31 +0000
treeherdercomm-beta@b51c9adf2c9e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersIanN
bugs1385543, 1380171
Bug 1385543 - Disable stylo building on all platforms for SeaMonkey. r=IanN See Bug 1380171 [Enable stylo on thunderbird].
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/mozconfigs/macosx64/debug
suite/config/mozconfigs/macosx64/l10n-mozconfig
suite/config/mozconfigs/macosx64/nightly
suite/config/mozconfigs/macosx64/release
suite/config/mozconfigs/macosx64/release-l10n
suite/config/mozconfigs/win32/debug
suite/config/mozconfigs/win32/l10n-mozconfig
suite/config/mozconfigs/win32/nightly
suite/config/mozconfigs/win32/release
suite/config/mozconfigs/win32/release-l10n
suite/config/mozconfigs/win64/debug
suite/config/mozconfigs/win64/l10n-mozconfig
suite/config/mozconfigs/win64/nightly
suite/config/mozconfigs/win64/release
suite/config/mozconfigs/win64/release-l10
--- a/suite/config/mozconfigs/linux32/debug
+++ b/suite/config/mozconfigs/linux32/debug
@@ -1,9 +1,10 @@
 . "$topsrcdir/build/unix/mozconfig.linux32"
+. "$topsrcdir/build/mozconfig.stylo"
 
 # Disable webrender on Linux buildbot builders to avoid the Rust requirement
 # of libX11 version > 1.4.99.1 (see bug 1350011).
 ac_add_options --disable-webrender
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-debug
 ac_add_options --enable-calendar
--- a/suite/config/mozconfigs/linux32/l10n-mozconfig
+++ b/suite/config/mozconfigs/linux32/l10n-mozconfig
@@ -1,9 +1,10 @@
 . "$topsrcdir/build/unix/mozconfig.linux32"
+. "$topsrcdir/build/mozconfig.stylo"
 
 # Disable webrender on Linux buildbot builders to avoid the Rust requirement
 # of libX11 version > 1.4.99.1 (see bug 1350011).
 ac_add_options --disable-webrender
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
--- a/suite/config/mozconfigs/linux32/nightly
+++ b/suite/config/mozconfigs/linux32/nightly
@@ -1,10 +1,11 @@
 . "$topsrcdir/build/unix/mozconfig.linux32"
 . "$topsrcdir/suite/config/mozconfigs/mozconfig.linux.common"
+. "$topsrcdir/build/mozconfig.stylo"
 
 # Disable webrender on Linux buildbot builders to avoid the Rust requirement
 # of libX11 version > 1.4.99.1 (see bug 1350011).
 ac_add_options --disable-webrender
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-profiling
--- a/suite/config/mozconfigs/linux32/release
+++ b/suite/config/mozconfigs/linux32/release
@@ -1,10 +1,11 @@
 . "$topsrcdir/build/unix/mozconfig.linux32"
 . "$topsrcdir/suite/config/mozconfigs/mozconfig.linux.common"
+. "$topsrcdir/build/mozconfig.stylo"
 
 # Disable webrender on Linux buildbot builders to avoid the Rust requirement
 # of libX11 version > 1.4.99.1 (see bug 1350011).
 ac_add_options --disable-webrender
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-official-branding
--- a/suite/config/mozconfigs/linux32/release-l10n
+++ b/suite/config/mozconfigs/linux32/release-l10n
@@ -1,9 +1,10 @@
 . "$topsrcdir/build/unix/mozconfig.linux32"
+. "$topsrcdir/build/mozconfig.stylo"
 
 # Disable webrender on Linux buildbot builders to avoid the Rust requirement
 # of libX11 version > 1.4.99.1 (see bug 1350011).
 ac_add_options --disable-webrender
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
--- a/suite/config/mozconfigs/linux64/l10n-mozconfig
+++ b/suite/config/mozconfigs/linux64/l10n-mozconfig
@@ -1,9 +1,10 @@
 . "$topsrcdir/build/unix/mozconfig.linux"
+. "$topsrcdir/build/mozconfig.stylo"
 
 # Disable webrender on Linux buildbot builders to avoid the Rust requirement
 # of libX11 version > 1.4.99.1 (see bug 1350011).
 ac_add_options --disable-webrender
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
--- a/suite/config/mozconfigs/linux64/nightly
+++ b/suite/config/mozconfigs/linux64/nightly
@@ -1,10 +1,11 @@
 . "$topsrcdir/build/unix/mozconfig.linux"
 . "$topsrcdir/suite/config/mozconfigs/mozconfig.linux.common"
+. "$topsrcdir/build/mozconfig.stylo"
 
 # Disable webrender on Linux buildbot builders to avoid the Rust requirement
 # of libX11 version > 1.4.99.1 (see bug 1350011).
 ac_add_options --disable-webrender
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-profiling
--- a/suite/config/mozconfigs/linux64/release
+++ b/suite/config/mozconfigs/linux64/release
@@ -1,10 +1,11 @@
 . "$topsrcdir/build/unix/mozconfig.linux"
 . "$topsrcdir/suite/config/mozconfigs/mozconfig.linux.common"
+. "$topsrcdir/build/mozconfig.stylo"
 
 # Disable webrender on Linux buildbot builders to avoid the Rust requirement
 # of libX11 version > 1.4.99.1 (see bug 1350011).
 ac_add_options --disable-webrender
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-official-branding
--- a/suite/config/mozconfigs/linux64/release-l10n
+++ b/suite/config/mozconfigs/linux64/release-l10n
@@ -1,9 +1,10 @@
 . "$topsrcdir/build/unix/mozconfig.linux"
+. "$topsrcdir/build/mozconfig.stylo"
 
 # Disable webrender on Linux buildbot builders to avoid the Rust requirement
 # of libX11 version > 1.4.99.1 (see bug 1350011).
 ac_add_options --disable-webrender
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
--- a/suite/config/mozconfigs/macosx64/debug
+++ b/suite/config/mozconfigs/macosx64/debug
@@ -11,14 +11,8 @@ export MOZILLA_OFFICIAL=1
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_SIGNING=0
 
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
 
 ac_add_options --with-ccache
-
-# Disable stylo.
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1380171
-ac_add_options --disable-stylo
-
-unset LLVM_CONFIG
--- a/suite/config/mozconfigs/macosx64/l10n-mozconfig
+++ b/suite/config/mozconfigs/macosx64/l10n-mozconfig
@@ -13,14 +13,8 @@ ac_add_options --disable-compile-environ
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_SIGNING=0
-
-# Disable stylo.
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1380171
-ac_add_options --disable-stylo
-
-unset LLVM_CONFIG
--- a/suite/config/mozconfigs/macosx64/nightly
+++ b/suite/config/mozconfigs/macosx64/nightly
@@ -14,14 +14,8 @@ export MOZ_PACKAGE_JSSHELL=1
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_SIGNING=0
 
 ac_add_options --with-ccache
-
-# Disable stylo.
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1380171
-ac_add_options --disable-stylo
-
-unset LLVM_CONFIG
--- a/suite/config/mozconfigs/macosx64/release
+++ b/suite/config/mozconfigs/macosx64/release
@@ -11,14 +11,8 @@ export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_SIGNING=0
 
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
-
-# Disable stylo.
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1380171
-ac_add_options --disable-stylo
-
-unset LLVM_CONFIG
--- a/suite/config/mozconfigs/macosx64/release-l10n
+++ b/suite/config/mozconfigs/macosx64/release-l10n
@@ -13,14 +13,8 @@ ac_add_options --disable-compile-environ
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_SIGNING=0
-
-# Disable stylo.
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1380171
-ac_add_options --disable-stylo
-
-unset LLVM_CONFIG
--- a/suite/config/mozconfigs/win32/debug
+++ b/suite/config/mozconfigs/win32/debug
@@ -1,10 +1,11 @@
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
+. "$topsrcdir/build/mozconfig.stylo"
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-debug
 ac_add_options --enable-calendar
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
--- a/suite/config/mozconfigs/win32/l10n-mozconfig
+++ b/suite/config/mozconfigs/win32/l10n-mozconfig
@@ -1,10 +1,11 @@
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
+. "$topsrcdir/build/mozconfig.stylo"
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 # Build lightning locales
 ac_add_options --enable-calendar
 
--- a/suite/config/mozconfigs/win32/nightly
+++ b/suite/config/mozconfigs/win32/nightly
@@ -1,11 +1,12 @@
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
 . "$topsrcdir/suite/config/mozconfigs/mozconfig.win.common"
+. "$topsrcdir/build/mozconfig.stylo"
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-jemalloc
 ac_add_options --enable-profiling
 ac_add_options --enable-calendar
 
 # Needed to enable breakpad in application.ini
--- a/suite/config/mozconfigs/win32/release
+++ b/suite/config/mozconfigs/win32/release
@@ -1,11 +1,12 @@
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
 . "$topsrcdir/suite/config/mozconfigs/mozconfig.win.common"
+. "$topsrcdir/build/mozconfig.stylo"
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-official-branding
 ac_add_options --enable-jemalloc
 ac_add_options --enable-calendar
 
 # Needed to enable breakpad in application.ini
--- a/suite/config/mozconfigs/win32/release-l10n
+++ b/suite/config/mozconfigs/win32/release-l10n
@@ -1,10 +1,11 @@
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
+. "$topsrcdir/build/mozconfig.stylo"
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 # Build lightning locales
 ac_add_options --enable-calendar
 
--- a/suite/config/mozconfigs/win64/debug
+++ b/suite/config/mozconfigs/win64/debug
@@ -1,10 +1,11 @@
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
+. "$topsrcdir/build/mozconfig.stylo"
 
 ac_add_options --target=x86_64-pc-mingw32
 ac_add_options --host=x86_64-pc-mingw32
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-debug
 ac_add_options --enable-calendar
 
--- a/suite/config/mozconfigs/win64/l10n-mozconfig
+++ b/suite/config/mozconfigs/win64/l10n-mozconfig
@@ -1,10 +1,11 @@
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
+. "$topsrcdir/build/mozconfig.stylo"
 
 ac_add_options --target=x86_64-pc-mingw32
 ac_add_options --host=x86_64-pc-mingw32
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
--- a/suite/config/mozconfigs/win64/nightly
+++ b/suite/config/mozconfigs/win64/nightly
@@ -1,11 +1,12 @@
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
 . "$topsrcdir/suite/config/mozconfigs/mozconfig.win.common"
+. "$topsrcdir/build/mozconfig.stylo"
 
 ac_add_options --target=x86_64-pc-mingw32
 ac_add_options --host=x86_64-pc-mingw32
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-jemalloc
 ac_add_options --enable-profiling
--- a/suite/config/mozconfigs/win64/release
+++ b/suite/config/mozconfigs/win64/release
@@ -1,11 +1,12 @@
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
 . "$topsrcdir/suite/config/mozconfigs/mozconfig.win.common"
+. "$topsrcdir/build/mozconfig.stylo"
 
 ac_add_options --target=x86_64-pc-mingw32
 ac_add_options --host=x86_64-pc-mingw32
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-official-branding
 ac_add_options --enable-jemalloc
--- a/suite/config/mozconfigs/win64/release-l10
+++ b/suite/config/mozconfigs/win64/release-l10
@@ -1,10 +1,11 @@
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
+. "$topsrcdir/build/mozconfig.stylo"
 
 ac_add_options --target=x86_64-pc-mingw32
 ac_add_options --host=x86_64-pc-mingw32
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}