[Lunar-commits] <moonbase> firefox: clean-up and optimize Now firefox looks good. I optimized and cleaned-up build. Now it looks to run a little faster and have more responsiveness. I removed options which are not anymore present in configure.

[Zbigniew Luszpinski]

commit ae080ff239301e03462df5466a1c076910614166
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Tue Mar 27 22:31:17 2012 +0200

    firefox: clean-up and optimize
    Now firefox looks good. I optimized and cleaned-up build.
    Now it looks to run a little faster and have more responsiveness.
    I removed options which are not anymore present in configure.
---
 web/firefox/BUILD     |   25 ++++++++++++-------------
 web/firefox/DEPENDS   |    1 +
 web/firefox/mozconfig |   12 +++++-------
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/web/firefox/BUILD b/web/firefox/BUILD
index 167379b..d32d5f5 100644
--- a/web/firefox/BUILD
+++ b/web/firefox/BUILD
@@ -18,19 +18,14 @@
   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}  &&
 
-  echo "ac_add_options --disable-necko-wifi" >> mozconfig  &&
-  echo "ac_add_options --disable-system-sqlite" >> mozconfig  &&
-
   #Add DEPENDS options
-  if in_depends $MODULE "xulrunner" ; then
-    XUL=`module_version xulrunner`  &&
-    echo "ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-$XUL" >> mozconfig
-  fi  &&
 
   if in_depends $MODULE gnome-vfs ; then
     echo "ac_add_options --enable-gnomevfs" >> mozconfig
@@ -50,10 +45,14 @@
     echo "ac_add_options --disable-dbus" >> mozconfig
   fi  &&
 
+  if in_depends $MODULE libffi ; then
+    echo "ac_add_options --enable-system-ffi" >> mozconfig
+  else
+    echo "ac_add_options --disable-system-ffi" >> mozconfig
+  fi  &&
+
   if in_depends $MODULE sun-jdk ; then
-    echo "ac_add_options --with-java-include-path=/usr/java/default/include" >> mozconfig  &&
-    echo "ac_add_options --with-java-bin-path=/usr/java/default/bin" >> mozconfig  &&
-    echo "ac_add_options --enable-javaxpcom" >> mozconfig
+    echo "ac_add_options --with-java-bin-path=/usr/java/default/bin" >> mozconfig
   fi  &&
 
   #Add CONFIGURE options
@@ -70,10 +69,10 @@
     export CCACHE_DISABLE=1  &&
     echo "ac_add_options --enable-profile-guided-optimization" >> mozconfig  &&
     echo "mk_add_options PROFILE_GEN_SCRIPT='python $MOZ_OBJDIR/_profile/pgo/profileserver.py'" >> mozconfig  &&
-    make -f client.mk build &&
-    make -f client.mk profiledbuild
+    make -f client.mk build ${MAKES:+-j${MAKES}} &&
+    make -f client.mk profiledbuild ${MAKES:+-j${MAKES}}
   else
-    make -f client.mk build
+    make -f client.mk build ${MAKES:+-j${MAKES}}
   fi  &&
 
   cd ${MOZ_OBJDIR}  &&
diff --git a/web/firefox/DEPENDS b/web/firefox/DEPENDS
index 0f4ac7f..61d05b4 100644
--- a/web/firefox/DEPENDS
+++ b/web/firefox/DEPENDS
@@ -23,3 +23,4 @@ optional_depends "hunspell"         ""  ""  "For spelling support"
 # $OPTS is ignored in this BUILD
 optional_depends "libevent"         ""  ""  "For event detection"
 optional_depends "dbus-glib"        ""  ""  "For dbus support"
+optional_depends "libffi" "" "" "Use system libffi instead of compiling the one in firefox"
diff --git a/web/firefox/mozconfig b/web/firefox/mozconfig
index 568417f..3ca21fe 100644
--- a/web/firefox/mozconfig
+++ b/web/firefox/mozconfig
@@ -6,18 +6,13 @@ ac_add_options --with-user-appdir=".firefox"
 ac_add_options --with-system-zlib
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-bz2
-ac_add_options --enable-storage
-ac_add_options --enable-places
 ac_add_options --enable-application=browser
 ac_add_options --enable-default-toolkit=cairo-gtk2
 ac_add_options --enable-optimize="$CFLAGS"
 ac_add_options --enable-crypto
 ac_add_options --enable-strip
-ac_add_options --enable-canvas
-ac_add_options --enable-svg
 ac_add_options --enable-system-cairo
 ac_add_options --enable-xterm-updates
-ac_add_options --enable-libxul
 ac_add_options --enable-official-branding
 ac_add_options --enable-jemalloc
 ac_add_options --disable-debug
@@ -26,11 +21,14 @@ ac_add_options --disable-installer
 ac_add_options --disable-pedantic
 ac_add_options --disable-logging
 ac_add_options --disable-accessibility
-ac_add_options --enable-mathml
+ac_add_options --disable-updater
 ac_add_options --disable-os2-high-mem
 ac_add_options --enable-gio
 ac_add_options --enable-raw
 ac_add_options --with-system-libvpx
-ac_add_options --enable-splashscreen
 ac_add_options --enable-shared-js
 ac_add_options --enable-system-pixman
+ac_add_options --enable-tree-freetype
+ac_add_options --disable-crashreporter
+ac_add_options --disable-necko-wifi
+ac_add_options --disable-system-sqlite