From 54679a2b8b0ff378166266b9e37d527844c7a424 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@lavabit.com>
Date: Sun, 24 Feb 2013 20:10:59 -0200
Subject: icecat: fixing pgo

---
 libre/icecat/PKGBUILD      | 18 +++++-------------
 libre/icecat/mozconfig.pgo |  4 +++-
 2 files changed, 8 insertions(+), 14 deletions(-)

(limited to 'libre')

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index c5a35a16c..785e3e077 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -77,7 +77,7 @@ source=(
 md5sums=(
   c88a29aa92fc41a07e777a0e63ac5f7e
   2a35cf0054d0459993e3c3bae3d9841d
-  383e8e2a97a8b13fe56d153adb6878b6
+  dfeb4ab2c96aae3356a4c347eee0b97b
   3009b176cc5f9b1e416b1bf7c45b064b
   fcd2d895a0335c1b5fb652401e9da0d5
   b41f82994fa056ffa5f8e6d99570e27a
@@ -137,20 +137,12 @@ build() {
   chmod +x build/unix/run-icecat.sh # fix bug for bad file permition
 
   if $_pgo; then
-    export MOZ_PGO=1
-    export DISPLAY=:99
-    Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
-    _fail=0
-
-    make -f client.mk build || _fail=1
+    LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 &
+    LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS=$MAKEFLAGS
+    kill $! || true
   else
-    _fail=0
-
-    make -f client.mk build || _fail=1
+    LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS=$MAKEFLAGS
   fi
-
-  kill $! || true
-  return $_fail
 }
 
 package() {
diff --git a/libre/icecat/mozconfig.pgo b/libre/icecat/mozconfig.pgo
index 2f4ebe32b..30464c38c 100644
--- a/libre/icecat/mozconfig.pgo
+++ b/libre/icecat/mozconfig.pgo
@@ -1,3 +1,5 @@
 
 # PGO
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py 10'
+ac_add_options --enable-profile-guided-optimization
+mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
+mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo'
-- 
cgit v1.2.3