diff options
| -rw-r--r-- | libre/icecat/PKGBUILD | 35 | ||||
| -rw-r--r-- | libre/icecat/mozconfig | 2 | ||||
| -rw-r--r-- | libre/icecat/mozconfig.pgo | 5 |
3 files changed, 28 insertions, 14 deletions
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 4f2a5b4ef..c9be2b9e9 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -76,8 +76,8 @@ source=( ) md5sums=( c88a29aa92fc41a07e777a0e63ac5f7e - f6ade03013a0bcb7f1585c51cb488e81 - ac29b01c189f20abae2f3eef1618ffc0 + 2a35cf0054d0459993e3c3bae3d9841d + 383e8e2a97a8b13fe56d153adb6878b6 3009b176cc5f9b1e416b1bf7c45b064b fcd2d895a0335c1b5fb652401e9da0d5 b41f82994fa056ffa5f8e6d99570e27a @@ -88,10 +88,20 @@ md5sums=( ) build() { + # WebRTC build tries to execute "python" and expects Python 2 + # Workaround taken from chromium PKGBUILD on Archlinux + mkdir "$srcdir/python2-path" + ln -s /usr/bin/python2 "$srcdir/python2-path/python" + export PATH="$srcdir/python2-path:$PATH" + + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgname" + export PYTHON="/usr/bin/python2" + mv $pkgname-$pkgver $srcdir/gnuzilla-build cd $srcdir/gnuzilla-build cp $srcdir/mozconfig .mozconfig # Load our build config, disable SafeSearch + if $_pgo; then cat $srcdir/mozconfig.pgo >> .mozconfig fi @@ -108,7 +118,7 @@ build() { sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \ browser/base/Makefile.in - # This is a bug, we should fix it. + # This is a bug, we should fix it if [ $CARCH = mips64el ]; then # Fix MIPS N32 support. sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \ @@ -123,15 +133,20 @@ build() { fi chmod +x build/unix/run-icecat.sh # fix bug for bad file permition - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgname" - export PYTHON=/usr/bin/python2 if $_pgo; then - 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 - LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS=$MAKEFLAGS + export MOZ_PGO=1 + export DISPLAY=:99 + export MOZ_MAKE_FLAGS="$MAKEFLAGS" + unset MAKEFLAGS + + Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY & + _fail=0 + + make -f client.mk build || _fail=1 + + kill $! || true + return $_fail fi } diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig index e54cdb54c..7b27e3c6a 100644 --- a/libre/icecat/mozconfig +++ b/libre/icecat/mozconfig @@ -3,7 +3,7 @@ ac_add_options --prefix=/usr ac_add_options --libdir=/usr/lib -# Icecat +# IceCat export MOZ_PHOENIX=1 mk_add_options MOZ_PHOENIX=1 diff --git a/libre/icecat/mozconfig.pgo b/libre/icecat/mozconfig.pgo index b0c249ebf..2f4ebe32b 100644 --- a/libre/icecat/mozconfig.pgo +++ b/libre/icecat/mozconfig.pgo @@ -1,4 +1,3 @@ + # PGO -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' +mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py 10' |