From bb0b4528591d1fb50b6683da47a210066a00fbfb Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 22 Feb 2013 02:26:57 -0200 Subject: iceweasel-19.0.1-2: enabling pgo --- libre/iceweasel-libre/PKGBUILD | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'libre/iceweasel-libre/PKGBUILD') diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index c2c6adaa5..0a3225605 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -10,7 +10,7 @@ # Contributor: evr # Contributor: Muhammad 'MJ' Jassim -_pgo=false +_pgo=true # We're getting this from Debian Experimental _debname=iceweasel @@ -22,12 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=iceweasel pkgname=iceweasel-libre pkgver=$_debver.$_debrel -pkgrel=1 - -if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi -if $_pgo; then - pkgname+='-pgo' -fi +pkgrel=2 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=('i686' 'x86_64' 'mips64el') -- cgit v1.2.3 From 29e00823021242ee5a12102cfe536079024abfcd Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 22 Feb 2013 11:33:59 -0200 Subject: iceweasel-libre-19.0.1-3: improving pgo --- libre/iceweasel-libre/PKGBUILD | 18 +++++++++++------- libre/iceweasel-libre/mozconfig.pgo | 5 ++--- 2 files changed, 13 insertions(+), 10 deletions(-) (limited to 'libre/iceweasel-libre/PKGBUILD') diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 0a3225605..8da5d4bdf 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=iceweasel pkgname=iceweasel-libre pkgver=$_debver.$_debrel -pkgrel=2 +pkgrel=3 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=('i686' 'x86_64' 'mips64el') @@ -52,7 +52,7 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" md5sums=('b4c109e987f869f94220188a901d4425' 'e1d6920cb49c9de88b8e00eb14b1b0e7' 'f90c6a70d0a6d0a9e7f9a0eed6aeffd3' - 'ac29b01c189f20abae2f3eef1618ffc0' + '383e8e2a97a8b13fe56d153adb6878b6' 'acb402fa414bed916fb0e09dfc1485c4' '7b9e5996dd9fe0b186a43a297db1c6b5' 'abf5ecb74caa857abb42bcfbb3442d9c' @@ -144,11 +144,15 @@ build() { fi 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 + 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/iceweasel-libre/mozconfig.pgo b/libre/iceweasel-libre/mozconfig.pgo index b0c249ebf..2f4ebe32b 100644 --- a/libre/iceweasel-libre/mozconfig.pgo +++ b/libre/iceweasel-libre/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' -- cgit v1.2.3 From 48f162d6627ef7511b97c1bbbfdcdd279c9d8583 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 22 Feb 2013 12:06:38 -0200 Subject: iceweasel-libre-19.0.1-3: adding MOZ_MAKE_FLAGS export line --- libre/iceweasel-libre/PKGBUILD | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'libre/iceweasel-libre/PKGBUILD') diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 8da5d4bdf..c571352f4 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -73,12 +73,14 @@ build() { 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" + export QUILT_PATCHES=debian/patches export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' export QUILT_DIFF_ARGS='--no-timestamps' - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname" - export PYTHON="/usr/bin/python2" export DEBIAN_BUILD="mozilla-release" + mv debian "$srcdir/$DEBIAN_BUILD" cd "$srcdir/$DEBIAN_BUILD" @@ -146,6 +148,9 @@ build() { if $_pgo; then 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 -- cgit v1.2.3 From 10a551d11878e8d6872170293f32ec2dbf57f567 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 22 Feb 2013 15:30:17 -0200 Subject: iceweasel-libre: revert last changes due that iceweasel uses patches from debian adapted to use the previous commands --- libre/iceweasel-libre/PKGBUILD | 21 +++++++-------------- libre/iceweasel-libre/mozconfig.pgo | 4 +++- 2 files changed, 10 insertions(+), 15 deletions(-) (limited to 'libre/iceweasel-libre/PKGBUILD') diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index c571352f4..065835d99 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=iceweasel pkgname=iceweasel-libre pkgver=$_debver.$_debrel -pkgrel=3 +pkgrel=2 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=('i686' 'x86_64' 'mips64el') @@ -52,7 +52,7 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" md5sums=('b4c109e987f869f94220188a901d4425' 'e1d6920cb49c9de88b8e00eb14b1b0e7' 'f90c6a70d0a6d0a9e7f9a0eed6aeffd3' - '383e8e2a97a8b13fe56d153adb6878b6' + 'dfeb4ab2c96aae3356a4c347eee0b97b' 'acb402fa414bed916fb0e09dfc1485c4' '7b9e5996dd9fe0b186a43a297db1c6b5' 'abf5ecb74caa857abb42bcfbb3442d9c' @@ -146,18 +146,11 @@ build() { fi if $_pgo; then - 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 + 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" fi } diff --git a/libre/iceweasel-libre/mozconfig.pgo b/libre/iceweasel-libre/mozconfig.pgo index 2f4ebe32b..30464c38c 100644 --- a/libre/iceweasel-libre/mozconfig.pgo +++ b/libre/iceweasel-libre/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