From b8c0fcce57ec6dedccd2ea228f1e038aa2c512f4 Mon Sep 17 00:00:00 2001 From: David Beauchamp Date: Thu, 24 Feb 2022 12:42:03 -0500 Subject: [PATCH] extra/java-openjdk to 17.0.3.u3-1 --- extra/java-openjdk/PKGBUILD | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/extra/java-openjdk/PKGBUILD b/extra/java-openjdk/PKGBUILD index 53f3b1039..66d92ea51 100644 --- a/extra/java-openjdk/PKGBUILD +++ b/extra/java-openjdk/PKGBUILD @@ -1,5 +1,6 @@ # Maintainer: Levente Polyak -# Maintainer: Guillaume ALAUX +# Maintainer: Frederik Schwan +# Contributor: Guillaume ALAUX # ALARM: Kevin Mihelich # - drop pandoc makedepend @@ -23,11 +24,11 @@ pkgbase=java-openjdk pkgname=('jre-openjdk-headless' 'jre-openjdk' 'jdk-openjdk' 'openjdk-src') _majorver=17 _minorver=0 -_securityver=1 -_updatever=12 -pkgrel=1 +_securityver=3 +_updatever=3 pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever} #pkgver=${_majorver}.u${_updatever} +pkgrel=1 _git_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever} #_git_tag=jdk-${_majorver}+${_updatever} arch=('x86_64') @@ -37,11 +38,12 @@ makedepends=('java-environment>=11' 'cpio' 'unzip' 'zip' 'libelf' 'libcups' 'lib 'libxrender' 'libxtst' 'libxt' 'libxext' 'libxrandr' 'alsa-lib' 'graphviz' 'freetype2' 'libjpeg-turbo' 'giflib' 'libpng' 'lcms2' 'libnet' 'bash' 'harfbuzz' 'gcc-libs' 'glibc') +options=(!lto) source=(https://github.com/openjdk/jdk${_majorver}u/archive/${_git_tag}.tar.gz freedesktop-java.desktop freedesktop-jconsole.desktop freedesktop-jshell.desktop) -sha256sums=('8c076203a6f85ab916b3e54de1992bcbcc5ffe580c52b1ac8d52ca7afb9f02d1' +sha256sums=('f985bc954c50b9c09d1f8fab698b6591cc46ce3ef6a18570aa192567ff661ca0' '85c4742764590783160af74587a47269e6797fbdf17ec485c7644bd239adf61d' 'abac1ab09a33a3654378bc69be5a7cf075263ab3ae9efec1eb25cf388e711bb7' 'e7cce0ecf868f656d8dc2eb25ab82ab665526a0a28aba20f02632dd29962dac3') @@ -90,6 +92,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::~ZList()': + # /build/java-openjdk/src/jdk17u-jdk-17.0.3-2/src/hotspot/share/gc/z/zList.hpp:54: undefined reference to `ZListNode::~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}"