[Lunar-commits] <moonbase> Revert "firefox: add option to build with PGO, and others"

[Zachary McGrew]

commit 8035c97eda19a9c1c4dd332119e445b87d2a880d
Author: Zachary McGrew <zmcgrew at lunar-linux.org>
Date:   Tue Mar 3 00:45:55 2009 -0800

    Revert "firefox: add option to build with PGO, and others"
    
    This reverts commit d4d41ec4f9ada7312430c3a3774ff52ec5a08e00.
---
 web/firefox/BUILD     |   28 ++++++++++------------------
 web/firefox/CONFIGURE |    3 ---
 web/firefox/DEPENDS   |    8 +++-----
 3 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/web/firefox/BUILD b/web/firefox/BUILD
index 32f93a8..193492a 100644
--- a/web/firefox/BUILD
+++ b/web/firefox/BUILD
@@ -8,7 +8,7 @@
 
   MOZILLA_HOME=/usr/lib/$MODULE-$VERSION
 
-  MOZ_EXTENSIONS="default,xforms,mozdevelop,venkman"
+  MOZ_EXTENSIONS="default,xforms"
 
   if in_depends $MODULE heimdal ; then
         MOZ_EXTENSIONS="${MOZ_EXTENSIONS},auth"
@@ -36,14 +36,14 @@
     --with-x            \
     --with-pthreads     \
     --with-default-mozilla-five-home=$MOZILLA_HOME \
-    --with-user-appdir=".firefox"  \
+    --with-user-appdir=".firefox"       \
     --with-system-zlib  \
     --with-system-jpeg  \
-    --enable-extensions=${MOZ_EXTENSIONS}  \
+    --enable-extensions=${MOZ_EXTENSIONS}       \
     --enable-single-profile        \
-    --enable-storage               \
-    --enable-places                \
-    --enable-places_bookmarks      \
+    --enable-storage \
+    --enable-places \
+    --enable-places_bookmarks \
     --enable-application=browser   \
     --enable-optimize="$CFLAGS"    \
     --enable-reorder    \
@@ -57,7 +57,7 @@
     --enable-svg-renderer=cairo  \
     --enable-system-cairo        \
     --enable-xterm-updates       \
-    --enable-libxul              \
+    --enable-libxul \
     --enable-official-branding   \
     --disable-debug     \
     --disable-freetype2 \
@@ -68,20 +68,12 @@
     --disable-mailnews  \
     --disable-logging   \
     --disable-accessibility     \
-    --disable-ldap              \
+    --disable-ldap      \
     --disable-profilesharing    \
-    --disable-mathml            \
+    --disable-mathml    \
     $OPTS               &&
 
-  if [ "$PGO" == "y" ] ; then
-    #CCache breaks the pgo build
-    export CCACHE_DISABLE=1
-    make PROFILE_GEN_SCRIPT="python $MOZ_OBJDIR/_profile/pgo/profileserver.py" profiledbuild  &&
-    prepare_install  &&
-    make install
-  else
-    default_make
-  fi  &&
+  default_make        &&
 
   # Put some important headers in place
   mkdir -p /usr/include/firefox-$VERSION/nss &&
diff --git a/web/firefox/CONFIGURE b/web/firefox/CONFIGURE
deleted file mode 100644
index 7343b8e..0000000
--- a/web/firefox/CONFIGURE
+++ /dev/null
@@ -1,3 +0,0 @@
-mquery PGO "Build with Profile Guided Optimization?"  y  "--enable-profile-guided-optimization"  ""
-mquery SAFE "Enable safe browsing (anti-phishing)?"  y  "--enable-safe-browsing"  ""
-mquery WEBSERVICES "Enable webservices support?"  y  "--enable-webservices"  ""
diff --git a/web/firefox/DEPENDS b/web/firefox/DEPENDS
index 3f203b5..4cf40da 100644
--- a/web/firefox/DEPENDS
+++ b/web/firefox/DEPENDS
@@ -9,12 +9,10 @@ depends curl
 optional_depends "sqlite" \
                  "--enable-system-sqlite" \
                  "--disable-system-sqlite" \
-                 "Use system sqlite"
-optional_depends "%FLASH"     ""  ""  "To enable Flash plugin"
-optional_depends "gnome-vfs"  ""  "--disable-gnomevfs"  "For Gnome VFS support"
+                 "use sqlite for firefox storage"
+optional_depends "%FLASH"    "" ""                 "to enable Shockwave Flash"
+optional_depends "gnome-vfs" "" "--disable-gnomevfs" "for Gnome VFS support"
 optional_depends "heimdal" \
                  "--with-gssapi=/usr/include/heimdal" \
                  "--without-gssapi" \
                  "Heimdal GSSAPI Support"
-optional_depends "Python"  ""  "" \
-                 "Needed to do a Profile Guided Optimized build"