summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Bidar2018-06-11 19:29:28 +0200
committerBjörn Bidar2018-06-11 19:29:28 +0200
commit2abd8dbcc27546e3248865c10fed3dd989b8a3c5 (patch)
tree46a5341d14c6cf1fe61cc38f4b757b3ae15804d8
parentbe27137d3a1aec189226dec805f8176425be57d0 (diff)
downloadaur-2abd8dbcc27546e3248865c10fed3dd989b8a3c5.tar.gz
urel, adopt fix for the use of ccache
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD16
2 files changed, 15 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5bcfa44e0426..d0ecc43c2198 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Mon Jun 11 17:09:14 UTC 2018
+# Mon Jun 11 17:28:55 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 = 2
+ pkgrel = 3
url = https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox
arch = i686
arch = x86_64
@@ -27,6 +27,7 @@ pkgbase = firefox-kde-opensuse
makedepends = llvm
makedepends = clang
makedepends = gtk2
+ makedepends = gcc7
depends = mozilla-common
depends = libxt
depends = startup-notification
diff --git a/PKGBUILD b/PKGBUILD
index 64a4e80fd602..d66ebf4379f8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ _gtk3_wayland=false
# try to build with PGO
# currently broken
-#_pgo=true
+_pgo=true
# globalmenu
# to support globalmenu a patch from ubuntu is applied
@@ -21,7 +21,7 @@ _gtk3_wayland=false
_pkgname=firefox
pkgname=$_pkgname-kde-opensuse
pkgver=60.0.2
-pkgrel=2
+pkgrel=3
pkgdesc="Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE"
arch=('i686' 'x86_64')
license=('MPL' 'GPL' 'LGPL')
@@ -178,9 +178,17 @@ build() {
fi
if [[ -n $_pgo ]]; then
+ CC=/usr/bin/gcc-7
+ CXX=/usr/bin/g++-7
+
+ if in_array ccache ${BUILDENV[*]} ; then
+ CC=/usr/lib/ccache/bin/cc
+ CXX=/usr/lib/ccache/bin/c++
+ fi
+
CCACHE_CC=/usr/bin/gcc-7 \
- CC=/usr/bin/gcc-7 \
- CXX=/usr/bin/g++-7 \
+ CC=$CC\
+ CXX=$CXX \
DISPLAY=:99 MOZ_PGO=1 \
xvfb-run \
-a \