summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTad Fisher2016-07-10 16:18:40 -0700
committerTad Fisher2016-07-10 16:18:40 -0700
commitd2ee23ff10d66320e67ad6747fbacad4228d0b48 (patch)
treefbdd975c5b1d9b7cbbabb695ac46d98e504cb16e
parent2e54755f481e6936721dac2ba68c336c1bb1a37b (diff)
downloadaur-d2ee23ff10d66320e67ad6747fbacad4228d0b48.tar.gz
Require GCC 5.x to build
-rw-r--r--PKGBUILD8
1 files changed, 7 insertions, 1 deletions
diff --git a/PKGBUILD b/PKGBUILD
index de0239749c3a..3f0fb3a2b5e5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,7 +18,7 @@ pkgrel=1
arch=('i686' 'x86_64')
url='https://github.com/JetBrains/jdk8u'
license=('custom')
-makedepends=('jdk7-openjdk' 'ccache' 'cpio' 'unzip' 'zip'
+makedepends=('jdk7-openjdk' 'gcc5' 'ccache' 'cpio' 'unzip' 'zip'
'libxrender' 'libxtst' 'fontconfig' 'libcups' 'alsa-lib')
_url_src=https://github.com/JetBrains
source=(jdk8u-${_repo_ver}::git+${_url_src}/jdk8u.git
@@ -68,6 +68,12 @@ prepare() {
}
build() {
+ # Workaround for OpenJDK not compiling with GCC 6
+ mkdir -p "${srcdir}/gcc-bin-override"
+ ln -sf "/usr/bin/gcc-5" "${srcdir}/gcc-bin-override/gcc"
+ ln -sf "/usr/bin/g++-5" "${srcdir}/gcc-bin-override/g++"
+ export PATH="${srcdir}/gcc-bin-override/:${PATH}"
+
cd "${srcdir}/jdk8u-${_repo_ver}"
unset JAVA_HOME