ice{cat,weasel-libre}: Rebuild with GCC 4.7.2 and PGO re-enabled for i686 => https://bugs.archlinux.org/task/34738

1 files changed, 11 insertions, 19 deletions

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index b589cbae5..d32a96d52 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -97,12 +97,10 @@ prepare() {
   # WebRTC build tries to execute "python" and expects Python 2
   ln -s /usr/bin/python2 "$srcdir/path/python"
 
-  # Use gold, as Mozilla can use some of its features, such as safe ICF
-  ln -s /usr/bin/ld.gold "$srcdir/path/ld"
-
   # configure script misdetects the preprocessor without an optimization level
   # https://bugs.archlinux.org/task/34644
-  sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
+  # TODO: re-enable when we're building with GCC >= 4.8 again
+  #sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
 }
 
 build() {
@@ -115,21 +113,15 @@ build() {
   unset MAKEFLAGS
 
   if $_pgo; then
-    # Enable PGO for x86_64 and mips64el only. i686 currently has problems:
-    # Either segfaults since gcc 4.8, or the linker runs out of memory
-    # If you discover that PGO again works on i686, please file a bug
-    if [[ $CARCH != i686 ]]; then
-       export DISPLAY=:99
-       Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
-       _fail=0
-
-       make -f client.mk build MOZ_PGO=1 || _fail=1
-
-       kill $! || true
-       return $_fail
-    else
-       make -f client.mk build
-    fi
+    # Enable PGO
+    export DISPLAY=:99
+    Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
+    _fail=0
+
+    make -f client.mk build MOZ_PGO=1 || _fail=1
+
+    kill $! || true
+    return $_fail
   else
     make -f client.mk build
   fi