Updated package java-15-openjdk 15.0.3.u3-2

2 files changed, 21 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 16e3759598cf..d7d089214b87 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = java-15-openjdk
 	pkgver = 15.0.3.u3
-	pkgrel = 1
+	pkgrel = 2
 	url = https://openjdk.java.net/
 	arch = x86_64
 	license = custom
@@ -58,7 +58,7 @@ pkgname = jre15-openjdk-headless
 	optdepends = java-rhino: for some JavaScript support
 	provides = java-runtime-headless=15
 	provides = java-runtime-headless-openjdk=15
-	provides = jre15-openjdk-headless=15.0.3.u3-1
+	provides = jre15-openjdk-headless=15.0.3.u3-2
 	backup = etc/java-15-openjdk/logging.properties
 	backup = etc/java-15-openjdk/management/jmxremote.access
 	backup = etc/java-15-openjdk/management/jmxremote.password.template
@@ -77,7 +77,7 @@ pkgname = jre15-openjdk-headless
 pkgname = jre15-openjdk
 	pkgdesc = OpenJDK Java 15 full runtime environment
 	install = install_jre-openjdk.sh
-	depends = jre15-openjdk-headless=15.0.3.u3-1
+	depends = jre15-openjdk-headless=15.0.3.u3-2
 	depends = giflib
 	depends = libgif.so
 	depends = glibc
@@ -88,12 +88,12 @@ pkgname = jre15-openjdk
 	optdepends = gtk3: for the Gtk+ 3 look and feel - desktop usage
 	provides = java-runtime=15
 	provides = java-runtime-openjdk=15
-	provides = jre15-openjdk=15.0.3.u3-1
+	provides = jre15-openjdk=15.0.3.u3-2
 
 pkgname = jdk15-openjdk
 	pkgdesc = OpenJDK Java 15 development kit
 	install = install_jdk-openjdk.sh
-	depends = jre15-openjdk=15.0.3.u3-1
+	depends = jre15-openjdk=15.0.3.u3-2
 	depends = java-environment-common=3
 	depends = hicolor-icon-theme
 	depends = libelf
@@ -102,14 +102,14 @@ pkgname = jdk15-openjdk
 	provides = java-environment=15
 	provides = java-environment-jdk=15
 	provides = java-environment-openjdk=15
-	provides = jdk15-openjdk=15.0.3.u3-1
+	provides = jdk15-openjdk=15.0.3.u3-2
 
 pkgname = openjdk15-src
 	pkgdesc = OpenJDK Java 15 sources
-	depends = jdk15-openjdk=15.0.3.u3-1
-	provides = openjdk15-src=15.0.3.u3-1
+	depends = jdk15-openjdk=15.0.3.u3-2
+	provides = openjdk15-src=15.0.3.u3-2
 
 pkgname = openjdk15-doc
 	pkgdesc = OpenJDK Java 15 documentation
-	depends = jdk15-openjdk=15.0.3.u3-1
-	provides = openjdk15-doc=15.0.3.u3-1
+	depends = jdk15-openjdk=15.0.3.u3-2
+	provides = openjdk15-doc=15.0.3.u3-2
diff --git a/PKGBUILD b/PKGBUILD
index 2074cdf875e2..9a965c0ee035 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ _majorver=15
 _minorver=0
 _securityver=3
 _updatever=3
-pkgrel=1
+pkgrel=2
 pkgver="${_majorver}.${_minorver}.${_securityver}.u${_updatever}"
 _hg_tag="jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever}"
 arch=('x86_64')
@@ -44,8 +44,8 @@ _nonheadless=(lib/libawt_xawt.{so,debuginfo}
               lib/libsplashscreen.{so,debuginfo})
 
 prepare() {
-  # Avoid the use of any Java 8-13, 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-|12-|13-' -m 1)"
+  # Use only Java versions 14-15
+  export JAVA_HOME="/usr/lib/jvm/$(archlinux-java status | tail -n +2 | sort | cut -d ' ' -f 3 | sort -nr -k 2 -t '-' | grep -E '14-|15-' -m 1)"
 }
 
 build() {
@@ -70,6 +70,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}"