No Bug - Attempt to fix mozconfigs for SeaMonkey 2.15 Beta. r+a=sm-release DONTBUILD SEAMONKEY_2_15b1_BUILD1 SEAMONKEY_2_15b1_RELEASE
authorJustin Wood <Callek@gmail.com>
Sun, 25 Nov 2012 17:12:03 -0500
changeset 13960 b3a385254669e076e48d19c4b0d3e5f5bc07dd88
parent 13955 b37400660da0aa6fdf9c1c05217ca62b2e65020b
child 13963 a47244f34da92a45fd13f4f69304b95ec9881629
push id770
push userCallek@gmail.com
push dateSun, 25 Nov 2012 22:16:30 +0000
treeherdercomm-beta@b3a385254669 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
No Bug - Attempt to fix mozconfigs for SeaMonkey 2.15 Beta. r+a=sm-release DONTBUILD
suite/config/mozconfigs/linux32/release-l10n
suite/config/mozconfigs/macosx-universal/release-l10n
--- a/suite/config/mozconfigs/linux32/release-l10n
+++ b/suite/config/mozconfigs/linux32/release-l10n
@@ -4,16 +4,20 @@ fi;
 if [ "$MOZ_UPDATE_CHANNEL" == "release" ]; then
   ac_add_options --with-l10n-base=../../releases/l10n/mozilla-release
 fi;
 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
 
+# 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"
 
--- a/suite/config/mozconfigs/macosx-universal/release-l10n
+++ b/suite/config/mozconfigs/macosx-universal/release-l10n
@@ -1,8 +1,28 @@
+if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig"; then
+  # We need some hackery to deal with the mozilla/ build system calling this
+  # mozconfig.
+  oldtopsrcdir=$topsrcdir
+  export topsrcdir=$topsrcdir/mozilla
+else
+  # Big Hack that unsets CC / CXX so that mozconfig.common doesn't get
+  # mixed up with host/target CPUs when trying to work out how to do the
+  # universal build. When we redo the build system (bug 648979) this will
+  # go away.
+  unset CC
+  unset CXX
+fi
+
+. $topsrcdir/build/macosx/universal/mozconfig
+
+if test -n $oldtopsrcdir; then
+  export topsrcdir=$oldtopsrcdir
+fi
+
 if [ "$MOZ_UPDATE_CHANNEL" == "beta" ]; then
   ac_add_options --with-l10n-base=../../releases/l10n/mozilla-beta
 fi;
 if [ "$MOZ_UPDATE_CHANNEL" == "release" ]; then
   ac_add_options --with-l10n-base=../../releases/l10n/mozilla-release
 fi;
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}