diff options
| author | Björn Bidar | 2018-06-11 19:09:19 +0200 |
|---|---|---|
| committer | Björn Bidar | 2018-06-11 19:09:19 +0200 |
| commit | be27137d3a1aec189226dec805f8176425be57d0 (patch) | |
| tree | 5f695ba4f49508ed02a597b0589efd7c077b04df | |
| parent | 94bb5b51cdef2639c93b185dda30e7030f0269cc (diff) | |
| download | aur-be27137d3a1aec189226dec805f8176425be57d0.tar.gz | |
urel: fix pgo build, fix builddeps
added workaround by building with gcc7 when using pgo.
| -rw-r--r-- | .SRCINFO | 5 | ||||
| -rw-r--r-- | PKGBUILD | 15 |
2 files changed, 14 insertions, 6 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Sat Jun 9 05:52:18 UTC 2018 +# Mon Jun 11 17:09:14 UTC 2018 pkgbase = firefox-kde-opensuse pkgdesc = Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE pkgver = 60.0.2 - pkgrel = 1 + pkgrel = 2 url = https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox arch = i686 arch = x86_64 @@ -25,6 +25,7 @@ pkgbase = firefox-kde-opensuse makedepends = cargo makedepends = mercurial makedepends = llvm + makedepends = clang makedepends = gtk2 depends = mozilla-common depends = libxt @@ -21,7 +21,7 @@ _gtk3_wayland=false _pkgname=firefox pkgname=$_pkgname-kde-opensuse pkgver=60.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE" arch=('i686' 'x86_64') license=('MPL' 'GPL' 'LGPL') @@ -33,8 +33,11 @@ depends=('mozilla-common' 'libxt' 'startup-notification' 'mime-types' makedepends=('unzip' 'zip' 'diffutils' 'python2' 'yasm' 'mesa' 'imake' 'xorg-server-xvfb' 'libpulse' 'inetutils' 'autoconf2.13' 'rust' - 'cargo' 'mercurial' 'llvm' - 'gtk2') + 'cargo' 'mercurial' 'llvm' 'clang' + 'gtk2') +if [[ -n $_pgo ]] ; then + makedepends+=('gcc7') +fi optdepends=('networkmanager: Location detection via available WiFi networks' 'speech-dispatcher: Text-to-Speech') provides=("firefox=${pkgver}") @@ -168,12 +171,16 @@ build() { # Hardening LDFLAGS+=" -Wl,-z,now" + + if [[ -n $_lowmem || $CARCH == i686 ]]; then LDFLAGS+=" -Xlinker --no-keep-memory" fi if [[ -n $_pgo ]]; then - # Do PGO + CCACHE_CC=/usr/bin/gcc-7 \ + CC=/usr/bin/gcc-7 \ + CXX=/usr/bin/g++-7 \ DISPLAY=:99 MOZ_PGO=1 \ xvfb-run \ -a \ |