From 696a3dfae03d9ca8ca6ed8e733b04b31e2371805 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 2 Jan 2012 21:59:59 -0500 Subject: Disabable pgo in iceweasel-libre ... by default. If you edit the PKGBUILD and set "_pgo=true", then it will build iceweasel-libre-pgo. --- mozilla-testing/iceweasel-libre/PKGBUILD | 36 +++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 8 deletions(-) (limited to 'mozilla-testing/iceweasel-libre/PKGBUILD') diff --git a/mozilla-testing/iceweasel-libre/PKGBUILD b/mozilla-testing/iceweasel-libre/PKGBUILD index a9c8fdd76..5392a2bb8 100644 --- a/mozilla-testing/iceweasel-libre/PKGBUILD +++ b/mozilla-testing/iceweasel-libre/PKGBUILD @@ -1,6 +1,8 @@ # Maintainer: Luke Shumaker # Contributor: Henry Jensen +_pgo=false + # We're getting this from Debian Sid _debname=iceweasel _debver=9.0.1 @@ -13,6 +15,10 @@ pkgname=iceweasel-libre pkgver=${_debver}.${_debrel} pkgrel=2 +if $_pgo; then + pkgname+='-pgo' +fi + pkgdesc="A libre version of Debian Iceweasel, the browser based on Mozilla Firefox." arch=('i586' 'i686' 'x86_64' 'mips64el') license=('GPL2' 'MPL' 'LGPL') @@ -47,16 +53,21 @@ makedepends=( 'python2' 'quilt' 'wireless_tools' - 'xorg-server-xvfb' 'yasm' 'zip' ) +if $_pgo; then + makedepends+=('xorg-server-xvfb') + options=(!ccache) +fi + url="http://www.geticeweasel.org/" install=iceweasel.install source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz" "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.dsc" mozconfig + mozconfig.pgo xulrunner-copy-stub.patch libre.patch iceweasel-install-dir.patch @@ -100,8 +111,8 @@ build() { patch -Np1 -i "$srcdir/libre.patch" cp -f ${srcdir}/region.properties ./browser/locales/en-US/chrome/browser-region/ - if [[ $(check_buildenv ccache) = "y" && $(check_option ccache) != "n" ]]; then - echo "ac_add_options --with-ccache=`which ccache`" >> .mozconfig + if $_pgo; then + cat "$srcdir/mozconfig.pgo" >> .mozconfig fi # Fix PRE_RELEASE_SUFFIX @@ -111,9 +122,13 @@ build() { export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname" export PYTHON="/usr/bin/python2" - 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 + 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" + fi } package() { @@ -125,7 +140,11 @@ package() { # For some crazy reason, pgo moves the branding (and many other non-object # files) to odd locations in the ff-pgo directory. _brandingdir=debian/branding - brandingdir=ff-pgo/dist/branding + if $_pgo; then + brandingdir=ff-pgo/dist/branding + else + brandingdir=$_brandingdir + fi for i in 16x16 32x32 48x48; do install -Dm644 "$brandingdir/default${i/x*/}.png" "$pkgdir/usr/share/icons/hicolor/$i/apps/$_pkgname.png" done @@ -152,7 +171,8 @@ package() { md5sums=('bd656a24d0ba3d4ca7b68aca8081a07d' '6cde9fe38df1434fdcc0f3a078b0238e' 'd9b5f2a893ad80da492aec8c9a7cbb7c' - 'c401067e1ffcb8df5a53076845d28a88' + '1e3b075fd7963fe59c0687027637304d' + '27236cf92251e2e6a01e820e1d13e5d2' 'a485a2b5dc544a8a2bd40c985d2e5813' '3c1a7d6984b47a0ab36a5d8e6672cb2b' 'e529742c0a425648087bc3ce537fe4c5' -- cgit v1.2.3-2-g168b