Updated package java-13-openjdk 13.0.5.1.u1-2

2 files changed, 25 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 292720f5aa84..0c1af2d650dd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = java-13-openjdk
 	pkgver = 13.0.5.1.u1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://openjdk.java.net/
 	arch = x86_64
 	license = custom
@@ -26,7 +26,8 @@ pkgbase = java-13-openjdk
 	makedepends = lcms2
 	makedepends = libnet
 	makedepends = bash
-	source = http://hg.openjdk.java.net/jdk-updates/jdk13u/archive/jdk-13.0.5.1+1.tar.gz
+	options = !lto
+	source = https://hg.openjdk.java.net/jdk-updates/jdk13u/archive/jdk-13.0.5.1+1.tar.gz
 	source = freedesktop-java.desktop
 	source = freedesktop-jconsole.desktop
 	source = freedesktop-jshell.desktop
@@ -54,7 +55,7 @@ pkgname = jre13-openjdk-headless
 	optdepends = java-rhino: for some JavaScript support
 	provides = java-runtime-headless=13
 	provides = java-runtime-headless-openjdk=13
-	provides = jre13-openjdk-headless=13.0.5.1.u1-1
+	provides = jre13-openjdk-headless=13.0.5.1.u1-2
 	backup = etc/java-13-openjdk/logging.properties
 	backup = etc/java-13-openjdk/management/jmxremote.access
 	backup = etc/java-13-openjdk/management/jmxremote.password.template
@@ -73,33 +74,33 @@ pkgname = jre13-openjdk-headless
 pkgname = jre13-openjdk
 	pkgdesc = OpenJDK Java 13 full runtime environment
 	install = install_jre-openjdk.sh
-	depends = jre13-openjdk-headless=13.0.5.1.u1-1
+	depends = jre13-openjdk-headless=13.0.5.1.u1-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=13
 	provides = java-runtime-openjdk=13
-	provides = jre13-openjdk=13.0.5.1.u1-1
+	provides = jre13-openjdk=13.0.5.1.u1-2
 
 pkgname = jdk13-openjdk
 	pkgdesc = OpenJDK Java 13 development kit
 	install = install_jdk-openjdk.sh
-	depends = jre13-openjdk=13.0.5.1.u1-1
+	depends = jre13-openjdk=13.0.5.1.u1-2
 	depends = java-environment-common=3
 	depends = hicolor-icon-theme
 	depends = libelf
 	provides = java-environment=13
 	provides = java-environment-jdk=13
 	provides = java-environment-openjdk=13
-	provides = jdk13-openjdk=13.0.5.1.u1-1
+	provides = jdk13-openjdk=13.0.5.1.u1-2
 
 pkgname = openjdk13-src
 	pkgdesc = OpenJDK Java 13 sources
-	depends = jdk13-openjdk=13.0.5.1.u1-1
-	provides = openjdk13-src=13.0.5.1.u1-1
+	depends = jdk13-openjdk=13.0.5.1.u1-2
+	provides = openjdk13-src=13.0.5.1.u1-2
 
 pkgname = openjdk13-doc
 	pkgdesc = OpenJDK Java 13 documentation
-	depends = jdk13-openjdk=13.0.5.1.u1-1
-	provides = openjdk13-doc=13.0.5.1.u1-1
+	depends = jdk13-openjdk=13.0.5.1.u1-2
+	provides = openjdk13-doc=13.0.5.1.u1-2
diff --git a/PKGBUILD b/PKGBUILD
index 44a258d05976..bb3fbb83b1b2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,17 +10,18 @@ _majorver=13
 _minorver=0
 _securityver=5.1
 _updatever=1
-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-jdk<=13' 'cpio' 'unzip' 'zip' 'libelf' 'libcups' 'libx11'
              'libxrender' 'libxtst' 'libxt' 'libxext' 'libxrandr' 'alsa-lib' 'pandoc'
              'graphviz' 'freetype2' 'libjpeg-turbo' 'giflib' 'libpng' 'lcms2'
              'libnet' 'bash')
-source=("http://hg.openjdk.java.net/jdk-updates/jdk${_majorver}u/archive/${_hg_tag}.tar.gz"
+source=("https://hg.openjdk.java.net/jdk-updates/jdk${_majorver}u/archive/${_hg_tag}.tar.gz"
         "freedesktop-java.desktop"
         "freedesktop-jconsole.desktop"
         "freedesktop-jshell.desktop"
@@ -50,8 +51,8 @@ _nonheadless=(lib/libawt_xawt.{so,debuginfo}
               lib/libsplashscreen.{so,debuginfo})
 
 prepare() {
-  # Avoid the use of any Java 8-11, 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-|11-' -m 1)"
+  # Use only Java versions 12-13
+  export JAVA_HOME="/usr/lib/jvm/$(archlinux-java status | tail -n +2 | sort | cut -d ' ' -f 3 | sort -nr -k 2 -t '-' | grep -E '12-|13-' -m 1)"
 
   cd "${_jdkdir}"
   # Fixes for GCC 10
@@ -85,6 +86,14 @@ build() {
     _CXXFLAGS="${CXXFLAGS/-fno-plt/}"
   fi
 
+  # TODO: Should be rechecked for the next releases
+  # compiling with -fexceptions leads to:
+  # /usr/bin/ld: /build/java-openjdk/src/jdk17u-jdk-17.0.3-2/build/linux-x86_64-server-release/hotspot/variant-server/libjvm/objs/zPhysicalMemory.o: in function `ZList<ZMemory>::~ZList()':
+  # /build/java-openjdk/src/jdk17u-jdk-17.0.3-2/src/hotspot/share/gc/z/zList.hpp:54: undefined reference to `ZListNode<ZMemory>::~ZListNode()'
+  # collect2: error: ld returned 1 exit status
+  _CFLAGS=${CFLAGS/-fexceptions/}
+  _CXXFLAGS=${CXXFLAGS/-fexceptions/}
+
   # CFLAGS, CXXFLAGS and LDFLAGS are ignored as shown by a warning
   # in the output of ./configure unless used like such:
   #  --with-extra-cflags="${CFLAGS}"