[Lunar-commits] <moonbase-other> firefox: Moving a few things to PRE_BUILD and making a few adjustments to

[Dennis Veatch]

commit fd415f4406af2450ba5bdd5693b783c9e263ffb9
Author: Dennis Veatch <dennisveatch at bellsouth.net>
Date: Thu, 18 Sep 2014 14:11:33 -0400
URL: https://github.com/lunar-linux/moonbase-other/commit/fd415f4406af2450ba5bdd5693b783c9e263ffb9

firefox: Moving a few things to PRE_BUILD and making a few adjustments to

mozconfig.
---
  web/firefox/BUILD     | +0/-33    
  web/firefox/DEPENDS   | +2/-6     
  web/firefox/PRE_BUILD | +43/-0    
  web/firefox/mozconfig | +2/-2     
  4 files changed, 47 insertions(+), 41 deletions(-)

--- a/web/firefox/BUILD
+++ b/web/firefox/BUILD
@@ -1,37 +1,4 @@
 
-# To skirt around this make failure in libxul.so:
-# ftbzip2.c:183: undefined reference to `BZ2_bzDecompressInit'
-CFLAGS+=" -lbz2" &&
-
-# Evidently AVX can break mozilla builds on newer hardware
-# Removing it until it can be fixed somehow
-CFLAGS+=" -mno-avx" &&
-
-sedit 's/@PRE_RELEASE_SUFFIX@//g' browser/base/content/browser.xul &&
-
-export MOZ_CO_PROJECT=browser  &&
-export MOZILLA_HOME=/usr/lib/$MODULE-$VERSION &&
-export MOZILLA_OFFICIAL=1  &&
-export BUILD_OFFICIAL=1  &&
-export MOZ_MAKE_FILES=$MAKES  &&
-export MOZ_OPTIMIZE_FLAGS="$CFLAGS" &&
-export MOZ_DEBUG_FLAGS="$CFLAGS" &&
-
-cp $SCRIPT_DIRECTORY/mozconfig .  &&
-export MOZ_OBJDIR="${SOURCE_DIRECTORY}/build-mozilla"  &&
-mkdir -p ${MOZ_OBJDIR}  &&
-
-for flag in $OPTS; do
-  echo "ac_add_options $flag" >> mozconfig
-done &&
-
-# turn off this #$ bell during build
-setterm -bfreq -blength &&
-
-if [ -n "${MAKES}" ]; then
-  echo "mk_add_options MOZ_MAKE_FLAGS='-j${MAKES}'" >> mozconfig
-fi &&
-
 #Finally, the build!
 if [ "$PGO" == "y" ] ; then
   #CCache breaks the pgo build
--- a/web/firefox/DEPENDS
+++ b/web/firefox/DEPENDS
@@ -8,19 +8,15 @@ depends alsa-lib
 depends libvpx
 depends cairo
 
-optional_depends "freetype2"        "--enable-tree-freetype" "--disable-tree-freetype" "For freetype font support"
 optional_depends "Python"           ""  ""  "Needed to do a Profile Guided Optimization build"
 optional_depends "flash-plugin-11"  ""  ""  "To enable Flash plugin"
-
+optional_depends "freetype2"        "--enable-tree-freetype" "--disable-tree-freetype" "For freetype font support"
+optional_depends "icu4c"            "--with-system-icu" "--without-system-icu" "For ICU support"
 optional_depends "hunspell"         "--enable-system-hunspell"  "--disable-system-hunspell"  "For spelling support"
-
 optional_depends "libevent"         "--with-system-libevent"  "--without-system-libevent"  "For system library event detection"
-
 optional_depends "dbus-glib"        "--enable-dbus"  "--disable-dbus"  "For dbus support"
 optional_depends "libffi"           "--enable-system-ffi"  "--disable-system-ffi"  "Use system libffi instead of compiling the one in firefox"
-
 optional_depends "sun-jdk"          "--with-java-bin-path=/usr/java/default/bin" "" "For java support"
-
 optional_depends "pulseaudio"       "" "--disable-pulseaudio"  "Build PulseAudio sound backend"
 
 # firefox requires jpeg-turbo extensions, so NO, libjpeg is not enough
--- a/web/firefox/PRE_BUILD
+++ b/web/firefox/PRE_BUILD
@@ -5,3 +5,46 @@ if [ ! -e /usr/include/cairo/cairo-tee.h ] ; then
 fi
 
 default_pre_build
+
+# To skirt around this make failure in libxul.so:
+# ftbzip2.c:183: undefined reference to `BZ2_bzDecompressInit'
+CFLAGS+=" -lbz2" &&
+
+# Evidently AVX can break mozilla builds on newer hardware
+# Removing it until it can be fixed somehow
+CFLAGS+=" -mno-avx" &&
+
+sedit 's/@PRE_RELEASE_SUFFIX@//g' browser/base/content/browser.xul &&
+
+export MOZ_CO_PROJECT=browser  &&
+export MOZILLA_HOME=/usr/lib/$MODULE-$VERSION &&
+export MOZILLA_OFFICIAL=1  &&
+export BUILD_OFFICIAL=1  &&
+export MOZ_MAKE_FILES=$MAKES  &&
+export MOZ_OPTIMIZE_FLAGS="$CFLAGS" &&
+export MOZ_DEBUG_FLAGS="$CFLAGS" &&
+export MOZ_JEMALLOC=1 &&
+
+cp $SCRIPT_DIRECTORY/mozconfig .  &&
+export MOZ_OBJDIR="${SOURCE_DIRECTORY}/build-mozilla"  &&
+mkdir -p ${MOZ_OBJDIR}  &&
+
+
+if module_installed gst-plugins-base-1.0 ; then
+  echo "ac_add_options --enable-gstreamer=1.0" >> mozconfig
+   else
+ if module_install gst-plugins-base ; then
+  echo "ac_add_options --enable-gstreamer=0.10" >> mozconfig
+ fi
+fi &&
+
+for flag in $OPTS; do
+  echo "ac_add_options $flag" >> mozconfig
+done &&
+
+# turn off this #$ bell during build
+setterm -bfreq -blength &&
+
+if [ -n "${MAKES}" ]; then
+  echo "mk_add_options MOZ_MAKE_FLAGS='-j${MAKES}'" >> mozconfig
+fi
--- a/web/firefox/mozconfig
+++ b/web/firefox/mozconfig
@@ -27,8 +27,8 @@ ac_add_options --with-system-libvpx
 ac_add_options --enable-system-pixman
 ac_add_options --disable-crashreporter
 ac_add_options --disable-necko-wifi
-ac_add_options --disable-gnomevfs
-ac_add_options --enable-system-cairo
+ac_add_options --enable-jemalloc
+ac_add_options --enable-replace-malloc
 
 # startupcache deterministically segfaults on *some* systems. Just leave it disabled.
 ac_add_options --disable-startupcache