diff options
author | Alex Xu (Hello71) | 2022-09-03 15:45:00 -0400 |
---|---|---|
committer | Alex Xu (Hello71) | 2022-09-03 15:45:00 -0400 |
commit | 65c861574a778e85d858899c7bd0a86b22b2cbaa (patch) | |
tree | 08b3e4ed348c69df2b0bd969ccf36cf43759da1a | |
parent | 8391cb024a4ef4b80d0c3807908d14f5618169dd (diff) | |
download | aur-65c861574a778e85d858899c7bd0a86b22b2cbaa.tar.gz |
upgrade to 18.0.2.u9_openj9_0.33.1
-rw-r--r-- | .SRCINFO | 63 | ||||
-rw-r--r-- | PKGBUILD | 68 | ||||
-rw-r--r-- | omr-fam.patch | 70 | ||||
-rw-r--r-- | openj9-openjdk-override-version.patch | 11 |
4 files changed, 88 insertions, 124 deletions
@@ -1,5 +1,5 @@ pkgbase = java-openj9 - pkgver = 17.0.1.u12_openj9_0.29.1 + pkgver = 18.0.2.u9_openj9_0.33.1 pkgrel = 1 url = http://www.eclipse.org/openj9/ arch = x86_64 @@ -31,25 +31,26 @@ pkgbase = java-openj9 makedepends = numactl makedepends = nasm makedepends = cmake - source = openj9-openjdk-jdk17-fc67fbe.tar.gz::https://github.com/ibmruntimes/openj9-openjdk-jdk17/archive/fc67fbe50a0de9172d1aaac6e42464c8dc8e16ab.tar.gz - source = openj9-7d055df.tar.gz::https://github.com/eclipse/openj9/archive/7d055dfcb71452077db01fddfc3ccd845cd461d0.tar.gz - source = openj9-omr-e30892e.tar.gz::https://github.com/eclipse/openj9-omr/archive/e30892e2b525e89712747040b4186b9a055a93ce.tar.gz + options = !lto + source = openj9-openjdk-jdk18-8406c39.tar.gz::https://github.com/ibmruntimes/openj9-openjdk-jdk18/archive/8406c39ea29b99058d740398c9c07dccba04bc12.tar.gz + source = openj9-1d9d168.tar.gz::https://github.com/eclipse/openj9/archive/1d9d16830f713e97410e8eeed1c350e58f34fadb.tar.gz + source = openj9-omr-b58aa27.tar.gz::https://github.com/eclipse/openj9-omr/archive/b58aa2708c095efadf522f67aaef9f7de2a7cbc7.tar.gz source = freedesktop-java.desktop source = freedesktop-jconsole.desktop source = freedesktop-jshell.desktop source = omr-omrstr-iconv-failure-overflow.patch - source = omr-fam.patch - sha256sums = bbcf5b61c4707abf52cd56d24501f99cfbc9cfd55f8193426682983c2125fb47 - sha256sums = 17ffc04db676c0e17affad822b07e5d0e9243273761de8ce340a0220a2b4ff9a - sha256sums = 4662774fbe49421a6643759bc4565abdb3ae4bddb604618b805f1888623c94c9 + source = openj9-openjdk-override-version.patch + sha256sums = 8d3fce68bfed0b75c83e668227a87e7bf91d494c8e30819b4d20ac6334f98d7e + sha256sums = fa32d99c786b3901ad01f1aa2cfc4b995820c1574c80f74f87b51d86314389d5 + sha256sums = a8b5eba25141d50b6f57c1b92ef7340718e2052d5e1192b3f9d4260e4b53d023 sha256sums = 7cb89746dbbcf498dd43b53fee59b124f42e3ea0d8b7134ab803cc2bd6b50230 sha256sums = bf76024528d050fd912f72d73e18a814a930df3478b132a99a887fbbdc0c9dfd sha256sums = bd2d4da78a65eec20dc32e21fd4fe134a2483b0bbe2dfb940d66755acc237975 sha256sums = f37290530dcb8eb5acb4f70609c55b7e2be134f1052ebf20f117c2996a749858 - sha256sums = c288b0a1a2424967d9c00e4d07d16f5d703f6b9b1195839753480fcd9810faf5 + sha256sums = 2a97f38ee08ed6a80be38879b47b78fc710adb9dfb69c44d2a33bee45bd06263 pkgname = jre-openj9-headless - pkgdesc = OpenJDK Java 17 headless runtime environment + pkgdesc = OpenJDK Java 18 headless runtime environment install = install_jre-openj9-headless.sh depends = java-runtime-common>=3 depends = ca-certificates-utils @@ -66,9 +67,9 @@ pkgname = jre-openj9-headless depends = glibc depends = gcc-libs optdepends = java-rhino: for some JavaScript support - provides = java-runtime-headless=17 - provides = java-runtime-headless-openj9=17 - provides = jre17-openj9-headless=17.0.1.u12_openj9_0.29.1-1 + provides = java-runtime-headless=18 + provides = java-runtime-headless-openj9=18 + provides = jre18-openj9-headless=18.0.2.u9_openj9_0.33.1-1 backup = etc/java-openj9/logging.properties backup = etc/java-openj9/management/jmxremote.access backup = etc/java-openj9/management/jmxremote.password.template @@ -85,36 +86,40 @@ pkgname = jre-openj9-headless backup = etc/java-openj9/sound.properties pkgname = jre-openj9 - pkgdesc = OpenJDK Java 17 full runtime environment + pkgdesc = OpenJDK Java 18 full runtime environment install = install_jre-openj9.sh - depends = jre17-openj9-headless=17.0.1.u12_openj9_0.29.1-1 + depends = jre18-openj9-headless=18.0.2.u9_openj9_0.33.1-1 depends = giflib + depends = libgif.so + depends = glibc + depends = gcc-libs + depends = libpng 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=17 - provides = java-runtime-openj9=17 - provides = jre17-openj9=17.0.1.u12_openj9_0.29.1-1 + provides = java-runtime=18 + provides = java-runtime-openj9=18 + provides = jre18-openj9=18.0.2.u9_openj9_0.33.1-1 pkgname = jdk-openj9 - pkgdesc = OpenJDK Java 17 development kit + pkgdesc = OpenJDK Java 18 development kit install = install_jdk-openj9.sh - depends = jre17-openj9=17.0.1.u12_openj9_0.29.1-1 + depends = jre18-openj9=18.0.2.u9_openj9_0.33.1-1 depends = java-environment-common=3 depends = hicolor-icon-theme depends = libelf depends = glibc depends = gcc-libs - provides = java-environment=17 - provides = java-environment-openj9=17 - provides = jdk17-openj9=17.0.1.u12_openj9_0.29.1-1 + provides = java-environment=18 + provides = java-environment-openj9=18 + provides = jdk18-openj9=18.0.2.u9_openj9_0.33.1-1 pkgname = openj9-src - pkgdesc = OpenJDK Java 17 sources - depends = jdk17-openj9=17.0.1.u12_openj9_0.29.1-1 - provides = openj917-src=17.0.1.u12_openj9_0.29.1-1 + pkgdesc = OpenJDK Java 18 sources + depends = jdk18-openj9=18.0.2.u9_openj9_0.33.1-1 + provides = openj918-src=18.0.2.u9_openj9_0.33.1-1 pkgname = openj9-doc - pkgdesc = OpenJDK Java 17 documentation - depends = jdk17-openj9=17.0.1.u12_openj9_0.29.1-1 - provides = openj917-doc=17.0.1.u12_openj9_0.29.1-1 + pkgdesc = OpenJDK Java 18 documentation + depends = jdk18-openj9=18.0.2.u9_openj9_0.33.1-1 + provides = openj918-doc=18.0.2.u9_openj9_0.33.1-1 @@ -6,11 +6,11 @@ pkgbase=java-openj9 pkgname=('jre-openj9-headless' 'jre-openj9' 'jdk-openj9' 'openj9-src' 'openj9-doc') -_majorver=17 +_majorver=18 _minorver=0 -_securityver=1 -_updatever=12 -_openj9ver=0.29.1 +_securityver=2 +_updatever=9 +_openj9ver=0.33.1 pkgrel=1 pkgver=${_majorver}${_minorver:+.${_minorver}}${_securityver:+.${_securityver}}.u${_updatever}_openj9_${_openj9ver} arch=('x86_64') @@ -20,9 +20,10 @@ 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' 'numactl' 'nasm' 'cmake') -_openjdk_sha=fc67fbe50a0de9172d1aaac6e42464c8dc8e16ab -_openj9_sha=7d055dfcb71452077db01fddfc3ccd845cd461d0 -_openj9omr_sha=e30892e2b525e89712747040b4186b9a055a93ce +_openjdk_sha=8406c39ea29b99058d740398c9c07dccba04bc12 +_openj9_sha=1d9d16830f713e97410e8eeed1c350e58f34fadb +_openj9omr_sha=b58aa2708c095efadf522f67aaef9f7de2a7cbc7 +options=(!lto) source=(openj9-openjdk-jdk${_majorver}-${_openjdk_sha:0:7}.tar.gz::https://github.com/ibmruntimes/openj9-openjdk-jdk${_majorver}/archive/${_openjdk_sha}.tar.gz openj9-${_openj9_sha:0:7}.tar.gz::https://github.com/eclipse/openj9/archive/${_openj9_sha}.tar.gz openj9-omr-${_openj9omr_sha:0:7}.tar.gz::https://github.com/eclipse/openj9-omr/archive/${_openj9omr_sha}.tar.gz @@ -30,15 +31,15 @@ source=(openj9-openjdk-jdk${_majorver}-${_openjdk_sha:0:7}.tar.gz::https://githu freedesktop-jconsole.desktop freedesktop-jshell.desktop omr-omrstr-iconv-failure-overflow.patch - omr-fam.patch) -sha256sums=('bbcf5b61c4707abf52cd56d24501f99cfbc9cfd55f8193426682983c2125fb47' - '17ffc04db676c0e17affad822b07e5d0e9243273761de8ce340a0220a2b4ff9a' - '4662774fbe49421a6643759bc4565abdb3ae4bddb604618b805f1888623c94c9' + openj9-openjdk-override-version.patch) +sha256sums=('8d3fce68bfed0b75c83e668227a87e7bf91d494c8e30819b4d20ac6334f98d7e' + 'fa32d99c786b3901ad01f1aa2cfc4b995820c1574c80f74f87b51d86314389d5' + 'a8b5eba25141d50b6f57c1b92ef7340718e2052d5e1192b3f9d4260e4b53d023' '7cb89746dbbcf498dd43b53fee59b124f42e3ea0d8b7134ab803cc2bd6b50230' 'bf76024528d050fd912f72d73e18a814a930df3478b132a99a887fbbdc0c9dfd' 'bd2d4da78a65eec20dc32e21fd4fe134a2483b0bbe2dfb940d66755acc237975' 'f37290530dcb8eb5acb4f70609c55b7e2be134f1052ebf20f117c2996a749858' - 'c288b0a1a2424967d9c00e4d07d16f5d703f6b9b1195839753480fcd9810faf5') + '2a97f38ee08ed6a80be38879b47b78fc710adb9dfb69c44d2a33bee45bd06263') case "${CARCH}" in x86_64) _JARCH='x86_64';; @@ -46,7 +47,7 @@ case "${CARCH}" in esac _jvmdir=/usr/lib/jvm/java-${_majorver}-openj9 -_jdkdir=openj9-openjdk-jdk${_majorver}-${_openj9ver}-release +_jdkdir=openj9-openjdk-jdk${_majorver}-${_openjdk_sha} _imgdir=${_jdkdir}/build/linux-${_JARCH}-server-release/images _nonheadless=(lib/libawt_xawt.{so,debuginfo} @@ -57,17 +58,11 @@ _nonheadless=(lib/libawt_xawt.{so,debuginfo} prepare() { cd ${_jdkdir} - ln -s ../openj9-openj9-${_openj9ver} openj9 - ln -s ../openj9-omr-openj9-${_openj9ver} omr + ln -s ../openj9-${_openj9_sha} openj9 + ln -s ../openj9-omr-${_openj9omr_sha} omr patch -d omr -p1 -i $srcdir/omr-omrstr-iconv-failure-overflow.patch - patch -d omr -p1 -i $srcdir/omr-fam.patch - - sed -i -e '/^OPENJDK_SHA :=/s/:=.*/:= '$_openjdk_sha/ \ - -e '/^OPENJ9_SHA :=/s/:=.*/:= '$_openj9_sha/ \ - -e '/^OPENJ9_TAG :=/s/:=.*/:= openj9-'$_openj9ver/ \ - -e '/^OPENJ9OMR_SHA :=/s/:=.*/:= '$_openj9omr_sha/ \ - closed/OpenJ9.gmk + patch -p1 -i $srcdir/openj9-openjdk-override-version.patch find openj9/ omr/ -name CMakeLists.txt -exec sed -i -e '/set(OMR_WARNINGS_AS_ERRORS ON/s/ON/OFF/' {} + || die } @@ -94,6 +89,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}" @@ -126,8 +129,22 @@ build() { ${NUM_PROC_OPT} #--disable-javac-server - - make EXTRA_CMAKE_ARGS="-DCMAKE_C_FLAGS='${CFLAGS}' -DJ9JIT_EXTRA_CFLAGS='${CFLAGS}' -DCMAKE_CXX_FLAGS='${CXXFLAGS}' -DJ9JIT_EXTRA_CXXFLAGS='${CXXFLAGS}' -DCMAKE_EXE_LINKER_FLAGS='${LDFLAGS}'" images legacy-jre-image docs + local mycmakeargsx=( + "-DCMAKE_C_FLAGS='${CFLAGS}'" + "-DJ9JIT_EXTRA_CFLAGS='${CFLAGS}'" + "-DCMAKE_CXX_FLAGS='${CXXFLAGS}'" + "-DJ9JIT_EXTRA_CXXFLAGS='${CXXFLAGS}'" + "-DCMAKE_EXE_LINKER_FLAGS='${LDFLAGS}'" + -DOMR_WARNINGS_AS_ERRORS=OFF + -DOMR_PORT_NUMA_SUPPORT=$(usex numa) + ) + make \ + EXTRA_CMAKE_ARGS="${mycmakeargsx[*]}" \ + OPENJDK_SHA=${_openjdk_sha} \ + OPENJ9_SHA=${_openj9_sha} \ + OPENJ9_TAG=${_openj9ver} \ + OPENJ9OMR_SHA=${_openj9omr_sha} \ + images legacy-jre-image docs # https://bugs.openjdk.java.net/browse/JDK-8173610 find "../${_imgdir}" -iname '*.so' -exec chmod +x {} \; @@ -202,7 +219,8 @@ package_jre-openj9-headless() { package_jre-openj9() { pkgdesc="OpenJDK Java ${_majorver} full runtime environment" - depends=("jre${_majorver}-openj9-headless=${pkgver}-${pkgrel}" 'giflib') + depends=("jre${_majorver}-openj9-headless=${pkgver}-${pkgrel}" 'giflib' 'libgif.so' + 'glibc' 'gcc-libs' 'libpng') optdepends=('alsa-lib: for basic sound support' 'gtk2: for the Gtk+ 2 look and feel - desktop usage' 'gtk3: for the Gtk+ 3 look and feel - desktop usage') diff --git a/omr-fam.patch b/omr-fam.patch deleted file mode 100644 index 9141ec17c68c..000000000000 --- a/omr-fam.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff --git a/ddr/tools/blob_reader/blob_reader.cpp b/ddr/tools/blob_reader/blob_reader.cpp -index 028decd0c..a0212609f 100644 ---- a/ddr/tools/blob_reader/blob_reader.cpp -+++ b/ddr/tools/blob_reader/blob_reader.cpp -@@ -85,7 +85,7 @@ struct BlobHeaderV1 { - - struct BlobString { - uint16_t length; -- char data[1]; /* flexible array member */ -+ char data[]; - - void endian_swap() - { -diff --git a/include_core/ute_core.h b/include_core/ute_core.h -index 8b3b1c65d..330ea52c6 100644 ---- a/include_core/ute_core.h -+++ b/include_core/ute_core.h -@@ -125,7 +125,7 @@ typedef struct UtTraceRecord { - uint64_t threadSyn2; /* Thread synonym 2 */ - int32_t firstEntry; /* Offset to first trace entry */ - int32_t nextEntry; /* Offset to next entry */ -- char threadName[1]; /* Thread name */ -+ char threadName[]; /* Thread name */ - } UtTraceRecord; - - /* -diff --git a/include_core/ute_dataformat.h b/include_core/ute_dataformat.h -index 71d9e36ad..8a9dcb487 100644 ---- a/include_core/ute_dataformat.h -+++ b/include_core/ute_dataformat.h -@@ -180,7 +180,7 @@ typedef struct UtProcSection { - #define UT_TRACE_ACTIVE_SECTION_NAME "UTTA" - typedef struct UtActiveSection { - UtDataHeader header; /* Eyecatcher, version etc */ -- char active[1]; /* Trace activation commands */ -+ char active[]; /* Trace activation commands */ - } UtActiveSection; - - /* -@@ -191,7 +191,7 @@ typedef struct UtActiveSection { - #define UT_TRACE_SERVICE_SECTION_NAME "UTSS" - typedef struct UtServiceSection { - UtDataHeader header; /* Eyecatcher, version etc */ -- char level[1]; /* Service level info */ -+ char level[]; /* Service level info */ - } UtServiceSection; - - /* -@@ -202,7 +202,7 @@ typedef struct UtServiceSection { - #define UT_TRACE_STARTUP_SECTION_NAME "UTSO" - typedef struct UtStartupSection { - UtDataHeader header; /* Eyecatcher, version etc */ -- char options[1]; /* Startup options */ -+ char options[]; /* Startup options */ - } UtStartupSection; - - /* -diff --git a/omrtrace/omrtrace_internal.h b/omrtrace/omrtrace_internal.h -index e52347eac..a68a88abd 100644 ---- a/omrtrace/omrtrace_internal.h -+++ b/omrtrace/omrtrace_internal.h -@@ -157,7 +157,7 @@ typedef struct OMR_TraceGlobal OMR_TraceGlobal; - typedef struct UtTraceCfg { - UtDataHeader header; - struct UtTraceCfg *next; /* Next trace config command */ -- char command[1]; /* Start of variable length section */ -+ char command[]; /* Start of variable length section */ - } UtTraceCfg; - - typedef struct UtDeferredConfigInfo { diff --git a/openj9-openjdk-override-version.patch b/openj9-openjdk-override-version.patch new file mode 100644 index 000000000000..165262797522 --- /dev/null +++ b/openj9-openjdk-override-version.patch @@ -0,0 +1,11 @@ +--- a/closed/OpenJ9.gmk ++++ b/closed/OpenJ9.gmk +@@ -44,7 +44,7 @@ + # $4 - 'required' for a required repository, anything else for an optional one + GetVersion = $(eval $(call GetVersionHelper,$(strip $1),$(strip $2),$(strip $3),$(strip $4))) + define GetVersionHelper +- $2 := $$(if $(wildcard $3),$$(shell $(GIT) -C $3 rev-parse --short HEAD)) ++ $2 := $$(if $$($2),$$($2),$$(if $(wildcard $3),$$(shell $(GIT) -C $3 rev-parse --short HEAD))) + ifneq (,$$($2)) + VersionLabelWidth := $(shell $(ECHO) "$1" | $(AWK) "{ width = length; print (width > $(VersionLabelWidth) ? width : $(VersionLabelWidth)) }") + VersionPairs += "$1" "$$($2)" |