diff options
author | Alex Xu (Hello71) | 2021-10-27 10:34:59 -0400 |
---|---|---|
committer | Alex Xu (Hello71) | 2021-10-27 10:34:59 -0400 |
commit | 34748338c2813e5898b526c32914460ac17c9bc5 (patch) | |
tree | b39dc6410d4996115a0bb88767f9a154561051d0 | |
parent | 7e4fefb7a226b7dfb63a68eebd2d2639c7f32ea2 (diff) | |
download | aur-34748338c2813e5898b526c32914460ac17c9bc5.tar.gz |
update to 17.0.1_openj9_0.29.0, merge arch openjdk
-rw-r--r-- | .SRCINFO | 66 | ||||
-rw-r--r-- | PKGBUILD | 43 |
2 files changed, 66 insertions, 43 deletions
@@ -1,5 +1,5 @@ pkgbase = java-openj9 - pkgver = 16.0.2.u7_openj9_0.27.0 + pkgver = 17.0.1.u12_openj9_0.29.0 pkgrel = 1 url = http://www.eclipse.org/openj9/ arch = x86_64 @@ -25,20 +25,23 @@ pkgbase = java-openj9 makedepends = lcms2 makedepends = libnet makedepends = bash + makedepends = harfbuzz + makedepends = gcc-libs + makedepends = glibc makedepends = numactl makedepends = nasm makedepends = cmake - source = openj9-openjdk-jdk16-0.27.0.tar.gz::https://github.com/ibmruntimes/openj9-openjdk-jdk16/archive/v0.27.0-release.tar.gz - source = https://github.com/eclipse/openj9/archive/openj9-0.27.0.tar.gz - source = openj9-omr-0.27.0.tar.gz::https://github.com/eclipse/openj9-omr/archive/openj9-0.27.0.tar.gz + source = openj9-openjdk-jdk17-v0.29.0-release.tar.gz::https://github.com/ibmruntimes/openj9-openjdk-jdk17/archive/v0.29.0-release.tar.gz + source = https://github.com/eclipse/openj9/archive/openj9-0.29.0.tar.gz + source = openj9-omr-0.29.0.tar.gz::https://github.com/eclipse/openj9-omr/archive/openj9-0.29.0.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 = f4b90b065cf1ff9ec60da7f0a78635be499fba436b4a42cb7e0ce1b95b9275fd - sha256sums = b50e0846e12089f4f7956e1ed060835e8583a0793450b9757388352d67d89825 - sha256sums = de90911d2fb49ea4b3758914503af913d967733403d909e87d2984243fe04fe5 + sha256sums = d9998660b3ff0a806bfcdf2c419f00ed09a042b336e00f13464a8502d48c2a01 + sha256sums = eb70d4aa0ffb1c941169c15c41a071063abd9484cb60862a296ce376c5d00f40 + sha256sums = 1b9a0b507b4716f73839e7d9a6bf9a4f72738c7021fbcb862952171dad258393 sha256sums = 7cb89746dbbcf498dd43b53fee59b124f42e3ea0d8b7134ab803cc2bd6b50230 sha256sums = bf76024528d050fd912f72d73e18a814a930df3478b132a99a887fbbdc0c9dfd sha256sums = bd2d4da78a65eec20dc32e21fd4fe134a2483b0bbe2dfb940d66755acc237975 @@ -46,19 +49,26 @@ pkgbase = java-openj9 sha256sums = c288b0a1a2424967d9c00e4d07d16f5d703f6b9b1195839753480fcd9810faf5 pkgname = jre-openj9-headless - pkgdesc = OpenJDK Java 16 headless runtime environment + pkgdesc = OpenJDK Java 17 headless runtime environment install = install_jre-openj9-headless.sh depends = java-runtime-common>=3 depends = ca-certificates-utils depends = nss depends = libjpeg-turbo + depends = libjpeg.so depends = lcms2 + depends = liblcms2.so depends = libnet depends = freetype2 + depends = libfreetype.so + depends = harfbuzz + depends = libharfbuzz.so + depends = glibc + depends = gcc-libs optdepends = java-rhino: for some JavaScript support - provides = java-runtime-headless=16 - provides = java-runtime-headless-openj9=16 - provides = jre16-openj9-headless=16.0.2.u7_openj9_0.27.0-1 + provides = java-runtime-headless=17 + provides = java-runtime-headless-openj9=17 + provides = jre17-openj9-headless=17.0.1.u12_openj9_0.29.0-1 backup = etc/java-openj9/logging.properties backup = etc/java-openj9/management/jmxremote.access backup = etc/java-openj9/management/jmxremote.password.template @@ -75,34 +85,36 @@ pkgname = jre-openj9-headless backup = etc/java-openj9/sound.properties pkgname = jre-openj9 - pkgdesc = OpenJDK Java 16 full runtime environment + pkgdesc = OpenJDK Java 17 full runtime environment install = install_jre-openj9.sh - depends = jre16-openj9-headless=16.0.2.u7_openj9_0.27.0-1 + depends = jre17-openj9-headless=17.0.1.u12_openj9_0.29.0-1 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=16 - provides = java-runtime-openj9=16 - provides = jre16-openj9=16.0.2.u7_openj9_0.27.0-1 + provides = java-runtime=17 + provides = java-runtime-openj9=17 + provides = jre17-openj9=17.0.1.u12_openj9_0.29.0-1 pkgname = jdk-openj9 - pkgdesc = OpenJDK Java 16 development kit + pkgdesc = OpenJDK Java 17 development kit install = install_jdk-openj9.sh - depends = jre16-openj9=16.0.2.u7_openj9_0.27.0-1 + depends = jre17-openj9=17.0.1.u12_openj9_0.29.0-1 depends = java-environment-common=3 depends = hicolor-icon-theme depends = libelf - provides = java-environment=16 - provides = java-environment-openj9=16 - provides = jdk16-openj9=16.0.2.u7_openj9_0.27.0-1 + depends = glibc + depends = gcc-libs + provides = java-environment=17 + provides = java-environment-openj9=17 + provides = jdk17-openj9=17.0.1.u12_openj9_0.29.0-1 pkgname = openj9-src - pkgdesc = OpenJDK Java 16 sources - depends = jdk16-openj9=16.0.2.u7_openj9_0.27.0-1 - provides = openj916-src=16.0.2.u7_openj9_0.27.0-1 + pkgdesc = OpenJDK Java 17 sources + depends = jdk17-openj9=17.0.1.u12_openj9_0.29.0-1 + provides = openj917-src=17.0.1.u12_openj9_0.29.0-1 pkgname = openj9-doc - pkgdesc = OpenJDK Java 16 documentation - depends = jdk16-openj9=16.0.2.u7_openj9_0.27.0-1 - provides = openj916-doc=16.0.2.u7_openj9_0.27.0-1 + pkgdesc = OpenJDK Java 17 documentation + depends = jdk17-openj9=17.0.1.u12_openj9_0.29.0-1 + provides = openj917-doc=17.0.1.u12_openj9_0.29.0-1 @@ -6,11 +6,11 @@ pkgbase=java-openj9 pkgname=('jre-openj9-headless' 'jre-openj9' 'jdk-openj9' 'openj9-src' 'openj9-doc') -_majorver=16 +_majorver=17 _minorver=0 -_securityver=2 -_updatever=7 -_openj9ver=0.27.0 +_securityver=1 +_updatever=12 +_openj9ver=0.29.0 pkgrel=1 pkgver=${_majorver}${_minorver:+.${_minorver}}${_securityver:+.${_securityver}}.u${_updatever}_openj9_${_openj9ver} arch=('x86_64') @@ -19,8 +19,8 @@ license=('custom') makedepends=('java-environment>=11' 'cpio' 'unzip' 'zip' 'libelf' 'libcups' 'libx11' 'libxrender' 'libxtst' 'libxt' 'libxext' 'libxrandr' 'alsa-lib' 'graphviz' 'freetype2' 'libjpeg-turbo' 'giflib' 'libpng' 'lcms2' - 'libnet' 'bash' 'numactl' 'nasm' 'cmake') -source=(openj9-openjdk-jdk${_majorver}-${_openj9ver}.tar.gz::https://github.com/ibmruntimes/openj9-openjdk-jdk${_majorver}/archive/v${_openj9ver}-release.tar.gz + 'libnet' 'bash' 'harfbuzz' 'gcc-libs' 'glibc' 'numactl' 'nasm' 'cmake') +source=(openj9-openjdk-jdk${_majorver}-v${_openj9ver}-release.tar.gz::https://github.com/ibmruntimes/openj9-openjdk-jdk${_majorver}/archive/v${_openj9ver}-release.tar.gz https://github.com/eclipse/openj9/archive/openj9-${_openj9ver}.tar.gz openj9-omr-${_openj9ver}.tar.gz::https://github.com/eclipse/openj9-omr/archive/openj9-${_openj9ver}.tar.gz freedesktop-java.desktop @@ -28,9 +28,9 @@ source=(openj9-openjdk-jdk${_majorver}-${_openj9ver}.tar.gz::https://github.com/ freedesktop-jshell.desktop omr-omrstr-iconv-failure-overflow.patch omr-fam.patch) -sha256sums=('f4b90b065cf1ff9ec60da7f0a78635be499fba436b4a42cb7e0ce1b95b9275fd' - 'b50e0846e12089f4f7956e1ed060835e8583a0793450b9757388352d67d89825' - 'de90911d2fb49ea4b3758914503af913d967733403d909e87d2984243fe04fe5' +sha256sums=('d9998660b3ff0a806bfcdf2c419f00ed09a042b336e00f13464a8502d48c2a01' + 'eb70d4aa0ffb1c941169c15c41a071063abd9484cb60862a296ce376c5d00f40' + '1b9a0b507b4716f73839e7d9a6bf9a4f72738c7021fbcb862952171dad258393' '7cb89746dbbcf498dd43b53fee59b124f42e3ea0d8b7134ab803cc2bd6b50230' 'bf76024528d050fd912f72d73e18a814a930df3478b132a99a887fbbdc0c9dfd' 'bd2d4da78a65eec20dc32e21fd4fe134a2483b0bbe2dfb940d66755acc237975' @@ -65,6 +65,8 @@ prepare() { -e '/^OPENJ9_TAG :=/s/:=.*/:= openj9-'${_openj9ver}/ \ -e '/^OPENJ9OMR_SHA :=/s/:=.*/:= openj9-'${_openj9ver}/ \ closed/OpenJ9.gmk + + find openj9/ omr/ -name CMakeLists.txt -exec sed -i -e '/set(OMR_WARNINGS_AS_ERRORS ON/s/ON/OFF/' {} + || die } build() { @@ -94,13 +96,11 @@ build() { # --with-extra-cflags="${CFLAGS}" # --with-extra-cxxflags="${CXXFLAGS}" # --with-extra-ldflags="${LDFLAGS}" - # See also paragraph "Configure Control Variables from "jdk${_majorver}-${_hg_tag}/common/doc/building.md + # See also paragraph "Configure Control Variables from "jdk${_majorver}-${_git_tag}/common/doc/building.md unset CFLAGS unset CXXFLAGS unset LDFLAGS - # !@#$ing openj9 - export EXTRA_CMAKE_ARGS="-DOMR_WARNINGS_AS_ERRORS=OFF" bash configure \ --with-version-build="${_updatever}" \ --with-version-pre="" \ @@ -114,23 +114,33 @@ build() { --with-libpng=system \ --with-lcms=system \ --with-zlib=system \ + --with-harfbuzz=system \ --with-jvm-features=zgc \ --enable-unlimited-crypto \ --disable-warnings-as-errors{,-omr,-openj9} \ --disable-ddr \ - --with-cmake=yes + --with-cmake \ ${NUM_PROC_OPT} #--disable-javac-server - make images legacy-jre-image docs + + 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 # https://bugs.openjdk.java.net/browse/JDK-8173610 find "../${_imgdir}" -iname '*.so' -exec chmod +x {} \; } +check() { + cd ${_jdkdir} + # TODO package jtreg + # make -k check +} + package_jre-openj9-headless() { pkgdesc="OpenJDK Java ${_majorver} headless runtime environment" - depends=('java-runtime-common>=3' 'ca-certificates-utils' 'nss' 'libjpeg-turbo' 'lcms2' 'libnet' 'freetype2') + depends=('java-runtime-common>=3' 'ca-certificates-utils' 'nss' 'libjpeg-turbo' 'libjpeg.so' + 'lcms2' 'liblcms2.so' 'libnet' 'freetype2' 'libfreetype.so' 'harfbuzz' 'libharfbuzz.so' + 'glibc' 'gcc-libs') optdepends=('java-rhino: for some JavaScript support') provides=("java-runtime-headless=${_majorver}" "java-runtime-headless-openj9=${_majorver}" "jre${_majorver}-openj9-headless=${pkgver}-${pkgrel}") backup=(etc/${pkgbase}/logging.properties @@ -211,7 +221,8 @@ package_jre-openj9() { package_jdk-openj9() { pkgdesc="OpenJDK Java ${_majorver} development kit" - depends=("jre${_majorver}-openj9=${pkgver}-${pkgrel}" 'java-environment-common=3' 'hicolor-icon-theme' 'libelf') + depends=("jre${_majorver}-openj9=${pkgver}-${pkgrel}" 'java-environment-common=3' + 'hicolor-icon-theme' 'libelf' 'glibc' 'gcc-libs') provides=("java-environment=${_majorver}" "java-environment-openj9=${_majorver}" "jdk${_majorver}-openj9=${pkgver}-${pkgrel}") install=install_jdk-openj9.sh |