summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-04-12 17:00:24 -0300
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-04-12 17:00:24 -0300
commit4adad75f6e7fbd6cb2540713561cd9f72d249c35 (patch)
tree182d9d2d11100b733e9993380abebb5d2bb1c63e
parent33522bd5e5e4fdadb22b76d5f12a2d89d344067a (diff)
downloadabslibre-4adad75f6e7fbd6cb2540713561cd9f72d249c35.tar.gz
abslibre-4adad75f6e7fbd6cb2540713561cd9f72d249c35.tar.bz2
abslibre-4adad75f6e7fbd6cb2540713561cd9f72d249c35.zip
ice{cat,weasel-libre}: Rebuild with GCC 4.7.2 and PGO re-enabled for i686 => https://bugs.archlinux.org/task/34738
-rw-r--r--libre/icecat/PKGBUILD30
-rw-r--r--libre/iceweasel-libre/PKGBUILD30
2 files changed, 22 insertions, 38 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
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 7a8d85ff0..03dd71fba 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -140,12 +140,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() {
@@ -158,21 +156,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