Updated package base java-12-openjdk 12.0.2.u10-2

2 files changed, 15 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9836587d4565..6c61025d9bd0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = java-12-openjdk
 	pkgver = 12.0.2.u10
-	pkgrel = 1
+	pkgrel = 2
 	url = https://openjdk.java.net/
 	arch = x86_64
 	license = custom
@@ -26,6 +26,7 @@ pkgbase = java-12-openjdk
 	makedepends = lcms2
 	makedepends = libnet
 	makedepends = bash
+	options = !lto
 	source = http://hg.openjdk.java.net/jdk-updates/jdk12u/archive/jdk-12.0.2+10.tar.gz
 	source = freedesktop-java.desktop
 	source = freedesktop-jconsole.desktop
@@ -58,7 +59,7 @@ pkgname = jre12-openjdk-headless
 	optdepends = java-rhino: for some JavaScript support
 	provides = java-runtime-headless=12
 	provides = java-runtime-headless-openjdk=12
-	provides = jre12-openjdk-headless=12.0.2.u10-1
+	provides = jre12-openjdk-headless=12.0.2.u10-2
 	backup = etc/java-12-openjdk/logging.properties
 	backup = etc/java-12-openjdk/management/jmxremote.access
 	backup = etc/java-12-openjdk/management/jmxremote.password.template
@@ -77,33 +78,33 @@ pkgname = jre12-openjdk-headless
 pkgname = jre12-openjdk
 	pkgdesc = OpenJDK Java 12 full runtime environment
 	install = install_jre-openjdk.sh
-	depends = jre12-openjdk-headless=12.0.2.u10-1
+	depends = jre12-openjdk-headless=12.0.2.u10-2
 	depends = giflib
 	optdepends = alsa-lib: for basic sound support
 	optdepends = gtk2: for the Gtk+ 2 look and feel - desktop usage
 	optdepends = gtk3: for the Gtk+ 3 look and feel - desktop usage
 	provides = java-runtime=12
 	provides = java-runtime-openjdk=12
-	provides = jre12-openjdk=12.0.2.u10-1
+	provides = jre12-openjdk=12.0.2.u10-2
 
 pkgname = jdk12-openjdk
 	pkgdesc = OpenJDK Java 12 development kit
 	install = install_jdk-openjdk.sh
-	depends = jre12-openjdk=12.0.2.u10-1
+	depends = jre12-openjdk=12.0.2.u10-2
 	depends = java-environment-common=3
 	depends = hicolor-icon-theme
 	depends = libelf
 	provides = java-environment=12
 	provides = java-environment-jdk=12
 	provides = java-environment-openjdk=12
-	provides = jdk12-openjdk=12.0.2.u10-1
+	provides = jdk12-openjdk=12.0.2.u10-2
 
 pkgname = openjdk12-src
 	pkgdesc = OpenJDK Java 12 sources
-	depends = jdk12-openjdk=12.0.2.u10-1
-	provides = openjdk12-src=12.0.2.u10-1
+	depends = jdk12-openjdk=12.0.2.u10-2
+	provides = openjdk12-src=12.0.2.u10-2
 
 pkgname = openjdk12-doc
 	pkgdesc = OpenJDK Java 12 documentation
-	depends = jdk12-openjdk=12.0.2.u10-1
-	provides = openjdk12-doc=12.0.2.u10-1
+	depends = jdk12-openjdk=12.0.2.u10-2
+	provides = openjdk12-doc=12.0.2.u10-2
diff --git a/PKGBUILD b/PKGBUILD
index 1ba011564fc5..fa4f85dec69e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,12 +10,13 @@ _majorver=12
 _minorver=0
 _securityver=2
 _updatever=10
-pkgrel=1
+pkgrel=2
 pkgver="${_majorver}.${_minorver}.${_securityver}.u${_updatever}"
 _hg_tag="jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever}"
 arch=('x86_64')
 url='https://openjdk.java.net/'
 license=('custom')
+options=('!lto')
 makedepends=('java-environment<=12' 'cpio' 'unzip' 'zip' 'libelf' 'libcups' 'libx11'
              'libxrender' 'libxtst' 'libxt' 'libxext' 'libxrandr' 'alsa-lib' 'pandoc'
              'graphviz' 'freetype2' 'libjpeg-turbo' 'giflib' 'libpng' 'lcms2'
@@ -54,8 +55,8 @@ _nonheadless=(lib/libawt_xawt.{so,debuginfo}
               lib/libsplashscreen.{so,debuginfo})
 
 prepare() {
-  # Avoid the use of any Java 8-10, actually incompatible with the build
-  export JAVA_HOME="/usr/lib/jvm/$(archlinux-java status | tail -n +2 | sort | cut -d ' ' -f 3 | sort -nr -k 2 -t '-' | grep -vE '8-|9-|10-' -m 1)"
+  # Use only Java versions 11-12
+  export JAVA_HOME="/usr/lib/jvm/$(archlinux-java status | tail -n +2 | sort | cut -d ' ' -f 3 | sort -nr -k 2 -t '-' | grep -E '11-|12-' -m 1)"
 
   cd "${_jdkdir}"
   # Support compilers with multi-digit major version numbers