summaryrefslogtreecommitdiff
path: root/dev-java
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/openj9-openjdk-bin/Manifest30
-rw-r--r--dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.26_p4.ebuild (renamed from dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.20_p8.ebuild)2
-rw-r--r--dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.14_p7.ebuild (renamed from dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.8_p7.ebuild)2
-rw-r--r--dev-java/openj9-openjdk-bin/openj9-openjdk-bin-21.0.6_p7.ebuild117
-rw-r--r--dev-java/openj9-openjdk-jre-bin/Manifest15
-rw-r--r--dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.26_p4.ebuild (renamed from dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.20_p8.ebuild)3
-rw-r--r--dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.14_p7.ebuild (renamed from dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.8_p7.ebuild)3
-rw-r--r--dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-21.0.6_p7.ebuild85
-rw-r--r--dev-java/openj9-openjdk/Manifest8
-rw-r--r--dev-java/openj9-openjdk/openj9-openjdk-11.0.48.0.ebuild (renamed from dev-java/openj9-openjdk/openj9-openjdk-11.0.40.0.ebuild)38
-rw-r--r--dev-java/openj9-openjdk/openj9-openjdk-21.0.48.0.ebuild (renamed from dev-java/openj9-openjdk/openj9-openjdk-17.0.40.0.ebuild)26
11 files changed, 285 insertions, 44 deletions
diff --git a/dev-java/openj9-openjdk-bin/Manifest b/dev-java/openj9-openjdk-bin/Manifest
index 9624a51..b22ccfa 100644
--- a/dev-java/openj9-openjdk-bin/Manifest
+++ b/dev-java/openj9-openjdk-bin/Manifest
@@ -1,12 +1,18 @@
-DIST ibm-semeru-open-debugimage_aarch64_linux_11.0.20_8_openj9-0.40.0.tar.gz 272530796 SHA256 f760b6b6267fbddddc643710cdbe124ab64d531a64941e63fc1bce659029fcc2
-DIST ibm-semeru-open-debugimage_aarch64_linux_17.0.8_7_openj9-0.40.0.tar.gz 285749406 SHA256 c4cd196dda57bab3bcb65cf4e6a9e4e3afc09631d8d04db5328bbe877a50a392
-DIST ibm-semeru-open-debugimage_ppc64le_linux_11.0.20_8_openj9-0.40.0.tar.gz 352339723 SHA256 97f1d2730f4dbbad08603dcc933231de3a6a2eb9442713ac04b90c2f1442d152
-DIST ibm-semeru-open-debugimage_ppc64le_linux_17.0.8_7_openj9-0.40.0.tar.gz 367746021 SHA256 8c014d18bdac414f5d3096441b20a3c391ad58eaa141c9b62af7896755375af9
-DIST ibm-semeru-open-debugimage_x64_linux_11.0.20_8_openj9-0.40.0.tar.gz 364119325 SHA256 067faeb375fc6eb025c1435e35362338de36f50755370687aa953a86baf82abc
-DIST ibm-semeru-open-debugimage_x64_linux_17.0.8_7_openj9-0.40.0.tar.gz 380658643 SHA256 24d819e0bb8ce4060e4259003f3b842c0e98ce76cdc69dbbd2eb7811ae5713d9
-DIST ibm-semeru-open-jdk_aarch64_linux_11.0.20_8_openj9-0.40.0.tar.gz 201061810 SHA256 40aedd05e8dc71685488d6d518672c6c6866e6c0684c690708314746c809bd72
-DIST ibm-semeru-open-jdk_aarch64_linux_17.0.8_7_openj9-0.40.0.tar.gz 205153306 SHA256 48b7d0e887dd70cef3573394e3b591f2e5b1a4acdd00e69c10c4210eeece4e31
-DIST ibm-semeru-open-jdk_ppc64le_linux_11.0.20_8_openj9-0.40.0.tar.gz 206029889 SHA256 97b410f5929093b6424bd90e6dbcc5684eee480c2175207cbd7a24750358ba5b
-DIST ibm-semeru-open-jdk_ppc64le_linux_17.0.8_7_openj9-0.40.0.tar.gz 211431955 SHA256 cb673ea4d68363981ee054b71b146b47ca528cd28a88ec20fa21fb6e5464a8e7
-DIST ibm-semeru-open-jdk_x64_linux_11.0.20_8_openj9-0.40.0.tar.gz 205187490 SHA256 37700b66221fbc657a695c94882f398c23350d27ebe72c260cfc679ea87134ce
-DIST ibm-semeru-open-jdk_x64_linux_17.0.8_7_openj9-0.40.0.tar.gz 209221881 SHA256 12f51e74a449af35d8dcfe9d7809053c2d9a15e68ba74eacfadf9f4f97dead18
+DIST ibm-semeru-open-debugimage_aarch64_linux_11.0.26_4_openj9-0.49.0.tar.gz 388470497 SHA256 f401e98ad7c8af236e08d405f604cebaa2f45246567d0641e96a995a9ae96801
+DIST ibm-semeru-open-debugimage_aarch64_linux_17.0.14_7_openj9-0.49.0.tar.gz 383962955 SHA256 1649f65237984f903879c0ce7989bad1a50a135ed9f16ebdb3eef2f885ba5862
+DIST ibm-semeru-open-debugimage_aarch64_linux_21.0.6_7_openj9-0.49.0.tar.gz 387703742 SHA256 6bbaf3edabbdce9d112e8b50e31c76461c0f25a802ecb2a2754de9e7d3d4b19b
+DIST ibm-semeru-open-debugimage_ppc64le_linux_11.0.26_4_openj9-0.49.0.tar.gz 400720711 SHA256 412fb4ab239a9ec97b62d6baabe76e6f2394b62bdfc792d843386fc4098fcc6b
+DIST ibm-semeru-open-debugimage_ppc64le_linux_17.0.14_7_openj9-0.49.0.tar.gz 396415219 SHA256 fd38d0eb6734549717995e8fa90f98b389b422d798c4facada1268035174b374
+DIST ibm-semeru-open-debugimage_ppc64le_linux_21.0.6_7_openj9-0.49.0.tar.gz 400373285 SHA256 926594a7c5fde7ce3f80412fd69f74070c0f292325a41e3395d35e9649bd0a7a
+DIST ibm-semeru-open-debugimage_x64_linux_11.0.26_4_openj9-0.49.0.tar.gz 412147449 SHA256 61d6fb27fc23654651b2d367ef6145141697ed276e88f56d1f8632215eb87987
+DIST ibm-semeru-open-debugimage_x64_linux_17.0.14_7_openj9-0.49.0.tar.gz 407635989 SHA256 4b94d1918f18eb95fbc60cc87ad0e6c14ddea35a6a14894e3901a3886eadb33e
+DIST ibm-semeru-open-debugimage_x64_linux_21.0.6_7_openj9-0.49.0.tar.gz 411761072 SHA256 2acbf72d7ea09a3c0c1890d6c9ee407206b8044f2d734fb695f9de61a61eac32
+DIST ibm-semeru-open-jdk_aarch64_linux_11.0.26_4_openj9-0.49.0.tar.gz 205826199 SHA256 b6d20a7bde624df0d1f07a501edaa63573a4550aa50c1eac105ef0afb3957664
+DIST ibm-semeru-open-jdk_aarch64_linux_17.0.14_7_openj9-0.49.0.tar.gz 209124955 SHA256 87206cea25338cce0d348bc6956e38da71ae3d5ce3ceb3e399a0678b3c989ccb
+DIST ibm-semeru-open-jdk_aarch64_linux_21.0.6_7_openj9-0.49.0.tar.gz 222744253 SHA256 a71681168cba543a0c4d2bd43c4125cde3a908492f14e2c2549b4eb0e922ab20
+DIST ibm-semeru-open-jdk_ppc64le_linux_11.0.26_4_openj9-0.49.0.tar.gz 214780755 SHA256 e8e60ed9442617476bf5141ac61af1b6b99dcd13a379c88ed95f9a752677590f
+DIST ibm-semeru-open-jdk_ppc64le_linux_17.0.14_7_openj9-0.49.0.tar.gz 218290186 SHA256 c5c03d671a7c57b534044734f76c0a958eb396c5db742cb81c5ea015d45bd4ea
+DIST ibm-semeru-open-jdk_ppc64le_linux_21.0.6_7_openj9-0.49.0.tar.gz 231572995 SHA256 de58bccd963972fc756c6b4689d27b7286b3c7ade89270fc554d2c88fa5e204e
+DIST ibm-semeru-open-jdk_x64_linux_11.0.26_4_openj9-0.49.0.tar.gz 213260737 SHA256 5d53d417a08514dea2ed88d3efa0a04ba330189ffaaa1da4e349ae00f86c7e69
+DIST ibm-semeru-open-jdk_x64_linux_17.0.14_7_openj9-0.49.0.tar.gz 217121422 SHA256 6253cc925e1b9f53e2d26d752a64c9947d6c8cd45170116a77fa9a260b306d2b
+DIST ibm-semeru-open-jdk_x64_linux_21.0.6_7_openj9-0.49.0.tar.gz 230760484 SHA256 9a37a30a3803c00a3dbdb9c7d61f8a1cdf2d798e1a08903d35d7b55cc6ac2747
diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.20_p8.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.26_p4.ebuild
index c447ec6..dcd91b5 100644
--- a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.20_p8.ebuild
+++ b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.26_p4.ebuild
@@ -15,7 +15,7 @@ abi_uri() {
}
JDK_PV=${PV//_p/+}
-DL_PV=${JDK_PV}_openj9-0.40.0
+DL_PV=${JDK_PV}_openj9-0.49.0
SLOT=$(ver_cut 1)
SRC_URI="
diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.8_p7.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.14_p7.ebuild
index c447ec6..dcd91b5 100644
--- a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.8_p7.ebuild
+++ b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.14_p7.ebuild
@@ -15,7 +15,7 @@ abi_uri() {
}
JDK_PV=${PV//_p/+}
-DL_PV=${JDK_PV}_openj9-0.40.0
+DL_PV=${JDK_PV}_openj9-0.49.0
SLOT=$(ver_cut 1)
SRC_URI="
diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-21.0.6_p7.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-21.0.6_p7.ebuild
new file mode 100644
index 0000000..dcd91b5
--- /dev/null
+++ b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-21.0.6_p7.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-vm-2 toolchain-funcs
+
+abi_uri() {
+ echo "${2-$1}? (
+ debug? (
+ https://github.com/ibmruntimes/semeru${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/ibm-semeru-open-debugimage_${1}_linux_${DL_PV/+/_}.tar.gz
+ )
+ https://github.com/ibmruntimes/semeru${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/ibm-semeru-open-jdk_${1}_linux_${DL_PV/+/_}.tar.gz
+ )"
+}
+
+JDK_PV=${PV//_p/+}
+DL_PV=${JDK_PV}_openj9-0.49.0
+SLOT=$(ver_cut 1)
+
+SRC_URI="
+ $(abi_uri aarch64 arm64)
+ $(abi_uri ppc64le ppc64)
+ $(abi_uri x64 amd64)
+"
+
+DESCRIPTION="Prebuilt IBM Semeru JDK binaries provided by IBM"
+HOMEPAGE="https://developer.ibm.com/languages/java/semeru-runtimes/"
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+IUSE="alsa cups debug headless-awt selinux source"
+
+RDEPEND="
+ >=sys-apps/baselayout-java-0.1.0-r1
+ kernel_linux? (
+ media-libs/fontconfig:1.0
+ media-libs/freetype:2
+ media-libs/harfbuzz
+ elibc_glibc? ( >=sys-libs/glibc-2.2.5:* )
+ elibc_musl? ( sys-libs/musl )
+ sys-libs/zlib
+ alsa? ( media-libs/alsa-lib )
+ cups? ( net-print/cups )
+ selinux? ( sec-policy/selinux-java )
+ !headless-awt? (
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXrender
+ x11-libs/libXtst
+ )
+ )"
+
+RESTRICT="preserve-libs splitdebug"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk-${JDK_PV}"
+
+pkg_pretend() {
+ if [[ "$(tc-is-softfloat)" != "no" ]]; then
+ die "These binaries require a hardfloat system."
+ fi
+}
+
+src_unpack() {
+ default
+ if [[ ${A} == *_mac_* ]] ; then
+ mv -v "${S}/Contents/Home/"* "${S}" || die
+ rm -Rf "${S}/Contents" # drop macOS executable
+ fi
+}
+
+src_install() {
+ local dest="/opt/${P}"
+ local ddest="${ED}/${dest#/}"
+
+ # on macOS if they would exist they would be called .dylib, but most
+ # importantly, there are no different providers, so everything
+ # that's shipped works.
+ if [[ ${A} != *_mac_* ]] ; then
+ # Not sure why they bundle this as it's commonly available and they
+ # only do so on x86_64. It's needed by libfontmanager.so. IcedTea
+ # also has an explicit dependency while Oracle seemingly dlopens it.
+ rm -vf lib/libfreetype.so || die
+
+ # prefer system copy # https://bugs.gentoo.org/776676
+ rm -vf lib/libharfbuzz.so || die
+
+ # Oracle and IcedTea have libjsoundalsa.so depending on
+ # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
+ if ! use alsa ; then
+ rm -v lib/libjsound.* || die
+ fi
+
+ if use headless-awt ; then
+ rm -v lib/lib*{[jx]awt,splashscreen}* || die
+ fi
+ fi
+
+ if ! use source ; then
+ rm -v lib/src.zip || die
+ fi
+
+ rm -v lib/security/cacerts || die
+ dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
+ dodir "${dest}"
+ cp -pPR * "${ddest}" || die
+
+ # provide stable symlink
+ dosym "${P}" "/opt/${PN}-${SLOT}"
+
+ java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+ java-vm_set-pax-markings "${ddest}"
+ java-vm_revdep-mask
+ java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
diff --git a/dev-java/openj9-openjdk-jre-bin/Manifest b/dev-java/openj9-openjdk-jre-bin/Manifest
index db9f1b4..9c4e476 100644
--- a/dev-java/openj9-openjdk-jre-bin/Manifest
+++ b/dev-java/openj9-openjdk-jre-bin/Manifest
@@ -1,6 +1,9 @@
-DIST ibm-semeru-open-jre_aarch64_linux_11.0.20_8_openj9-0.40.0.tar.gz 45855654 SHA256 9e18c0e333f6d6c7962ccc0c2531c27921c4b76e108fded459e0659038c21f21
-DIST ibm-semeru-open-jre_aarch64_linux_17.0.8_7_openj9-0.40.0.tar.gz 45789622 SHA256 b8904df2fee0797e493e3482fddb873b25d1e05f27053a2d96a25310c2dce3d4
-DIST ibm-semeru-open-jre_ppc64le_linux_11.0.20_8_openj9-0.40.0.tar.gz 48605043 SHA256 2b767b490858900e773589e2c6395fef111c5d70696db371449491db617079d6
-DIST ibm-semeru-open-jre_ppc64le_linux_17.0.8_7_openj9-0.40.0.tar.gz 48853830 SHA256 0986b451944deac0832c2905f1497fddb3ab7c0f63cd9fad707072381c9948a1
-DIST ibm-semeru-open-jre_x64_linux_11.0.20_8_openj9-0.40.0.tar.gz 47781278 SHA256 7706a511bded7b3972cdb98c5c7942b8f2dcf9ab4c2a6e81d72fb8a754812bb2
-DIST ibm-semeru-open-jre_x64_linux_17.0.8_7_openj9-0.40.0.tar.gz 47708806 SHA256 461aab09409b3ac26ded0ca921171e141c6b1400a17d8026e924109518b365d4
+DIST ibm-semeru-open-jre_aarch64_linux_11.0.26_4_openj9-0.49.0.tar.gz 47702776 SHA256 2425d0daa7c0ef6603910c1c51ed7f3d8dbeb4dff8e1542957771ac5045fc21e
+DIST ibm-semeru-open-jre_aarch64_linux_17.0.14_7_openj9-0.49.0.tar.gz 47041849 SHA256 f26b2b2d8654a09fade4c0ce5819e72e00f1e751bb11a4731537e834900c3282
+DIST ibm-semeru-open-jre_aarch64_linux_21.0.6_7_openj9-0.49.0.tar.gz 51591397 SHA256 1090db3f7b30b4a45e3d5f228ac529ace87000bd9b342d91a639f0181a0058f5
+DIST ibm-semeru-open-jre_ppc64le_linux_11.0.26_4_openj9-0.49.0.tar.gz 52506982 SHA256 d013d38e03a3455c6867b10544dc30041bf7afdb595d60ee09af43d46cdb5720
+DIST ibm-semeru-open-jre_ppc64le_linux_17.0.14_7_openj9-0.49.0.tar.gz 51677267 SHA256 578a651e9e26de4ec30612afbd69c2530c8ed37db2c46bc62eb6a39dfa35c080
+DIST ibm-semeru-open-jre_ppc64le_linux_21.0.6_7_openj9-0.49.0.tar.gz 56159039 SHA256 ece962ee7ce419e25048a89228b61c4ce8c318ec6fade470484d6537bb87ea3f
+DIST ibm-semeru-open-jre_x64_linux_11.0.26_4_openj9-0.49.0.tar.gz 51312021 SHA256 08586859b8a53aa9d5424a38838e8332664622049c3c33b1b0e5ea88b56ce2d9
+DIST ibm-semeru-open-jre_x64_linux_17.0.14_7_openj9-0.49.0.tar.gz 50639277 SHA256 e2469f16a616ee467d6a590ec043ee9464b039d2f9859327dd36d50953cd60bf
+DIST ibm-semeru-open-jre_x64_linux_21.0.6_7_openj9-0.49.0.tar.gz 55202515 SHA256 cca7d1599ff83063dd16965dcbf91915a7654e5086f3b3b71744adf7769d11de
diff --git a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.20_p8.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.26_p4.ebuild
index 20b1d9b..4f5ad3b 100644
--- a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.20_p8.ebuild
+++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.26_p4.ebuild
@@ -12,7 +12,7 @@ abi_uri() {
}
JDK_PV=${PV//_p/+}
-DL_PV=${JDK_PV}_openj9-0.40.0
+DL_PV=${JDK_PV}_openj9-0.49.0
SLOT=$(ver_cut 1)
SRC_URI="
@@ -30,7 +30,6 @@ IUSE="alsa cups headless-awt selinux"
RDEPEND="
media-libs/fontconfig:1.0
media-libs/freetype:2
- >net-libs/libnet-1.1
>=sys-apps/baselayout-java-0.1.0-r1
>=sys-libs/glibc-2.2.5:*
sys-libs/zlib
diff --git a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.8_p7.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.14_p7.ebuild
index 20b1d9b..4f5ad3b 100644
--- a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.8_p7.ebuild
+++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.14_p7.ebuild
@@ -12,7 +12,7 @@ abi_uri() {
}
JDK_PV=${PV//_p/+}
-DL_PV=${JDK_PV}_openj9-0.40.0
+DL_PV=${JDK_PV}_openj9-0.49.0
SLOT=$(ver_cut 1)
SRC_URI="
@@ -30,7 +30,6 @@ IUSE="alsa cups headless-awt selinux"
RDEPEND="
media-libs/fontconfig:1.0
media-libs/freetype:2
- >net-libs/libnet-1.1
>=sys-apps/baselayout-java-0.1.0-r1
>=sys-libs/glibc-2.2.5:*
sys-libs/zlib
diff --git a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-21.0.6_p7.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-21.0.6_p7.ebuild
new file mode 100644
index 0000000..4f5ad3b
--- /dev/null
+++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-21.0.6_p7.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-vm-2
+
+abi_uri() {
+ echo "${2-$1}? (
+ https://github.com/ibmruntimes/semeru${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/ibm-semeru-open-jre_${1}_linux_${DL_PV/+/_}.tar.gz
+ )"
+}
+
+JDK_PV=${PV//_p/+}
+DL_PV=${JDK_PV}_openj9-0.49.0
+SLOT=$(ver_cut 1)
+
+SRC_URI="
+ $(abi_uri aarch64 arm64)
+ $(abi_uri ppc64le ppc64)
+ $(abi_uri x64 amd64)
+"
+
+DESCRIPTION="Prebuilt IBM Semeru JRE binaries provided by IBM"
+HOMEPAGE="https://developer.ibm.com/languages/java/semeru-runtimes/"
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+IUSE="alsa cups headless-awt selinux"
+
+RDEPEND="
+ media-libs/fontconfig:1.0
+ media-libs/freetype:2
+ >=sys-apps/baselayout-java-0.1.0-r1
+ >=sys-libs/glibc-2.2.5:*
+ sys-libs/zlib
+ alsa? ( media-libs/alsa-lib )
+ cups? ( net-print/cups )
+ selinux? ( sec-policy/selinux-java )
+ !headless-awt? (
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXrender
+ x11-libs/libXtst
+ )"
+
+RESTRICT="preserve-libs splitdebug"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk-${JDK_PV}-jre"
+
+src_install() {
+ local dest="/opt/${PN}-${SLOT}"
+ local ddest="${ED}/${dest#/}"
+
+ # Not sure why they bundle this as it's commonly available and they
+ # only do so on x86_64. It's needed by libfontmanager.so. IcedTea
+ # also has an explicit dependency while Oracle seemingly dlopens it.
+ rm -vf lib/libfreetype.so || die
+
+ # Oracle and IcedTea have libjsoundalsa.so depending on
+ # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
+ if ! use alsa ; then
+ rm -v lib/libjsound.* || die
+ fi
+
+ if use headless-awt ; then
+ rm -v lib/lib*{[jx]awt,splashscreen}* || die
+ fi
+
+ rm -v lib/security/cacerts || die
+ dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
+ dodir "${dest}"
+ cp -pPR * "${ddest}" || die
+
+ java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+ java-vm_set-pax-markings "${ddest}"
+ java-vm_revdep-mask
+ java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+ java-vm-2_pkg_postinst
+}
diff --git a/dev-java/openj9-openjdk/Manifest b/dev-java/openj9-openjdk/Manifest
index ff6a853..533a846 100644
--- a/dev-java/openj9-openjdk/Manifest
+++ b/dev-java/openj9-openjdk/Manifest
@@ -1,4 +1,4 @@
-DIST openj9-0.40.0.tar.gz 18146593 BLAKE2B fbc092d481f567ed697a87f90a2d0c657e195744a76e848e62061667f07d7c022b174c47b91cbf29606ed7a783042c825a82583d481ef2149e084816abf4af60 SHA512 4947d9863b84ae936a2e8a569fe62797b34ce30b3fe3e5792a640bd9a3d281fcc14ac1ac44b0a9c0b326ec31fc101d946dc38700f6a8e1f42cb0f3b7b7573860
-DIST openj9-omr-0.40.0.tar.gz 8037707 BLAKE2B d5df776d64293edb2d50ea0536f22a6ec6889fc4a84f5fab7d36792b9c0bc705631b65d4fbe028b08ad83d632aa8146a96371459a70eb63a262ce22016011d4a SHA512 9737c13bf1f6b67502355191cb34f45e3dc3fc80e429be5452c0f26a14cf5856040868c13e08e7e03b52f6b5f7ddc700f63a03488652a2a8e0d0f6f531f1d379
-DIST openj9-openjdk-jdk11-openj9-0.40.0.tar.gz 102287197 BLAKE2B c83dc8effa26d0966a0648d2f6e42250ea1fdc2ddf543e55e798945560d9686b0df42a32d37511a0c816ab9ab8aec2246abfe5fba4772e58e89b05b40ce053f6 SHA512 a32c361e18c31e2f07b039d25e68d2b2520c16d14e2d7dc5f9155721afe4f5065df3a681daa7029a9b967e8d3ab7095d422b835e4c7b4d187ee70ca9febdc7fb
-DIST openj9-openjdk-jdk17-openj9-0.40.0.tar.gz 94895676 BLAKE2B 3a5112a273df0451b4ed0818e9d1cb06715ae5fc8ee8fa1d30688d04b8bfd99e0d0bf59c22068109eb2344a2dc66038fc113e1afce5b19c4df7fa76a9d39feb8 SHA512 0d6b73ee0794e73888122a9852a21cc8ca6f087469f2d7f02143730f69b0e6b73319c416022a0f05406c0bda04153663884ea15feeaa3023b5381080f4306ce9
+DIST openj9-0.48.0.tar.gz 18480709 BLAKE2B 4d3d593ce295c0ba40ef32cc79f0e00b4864d2bc5d36e26c0bd0e2c3aa3406888e8a764472c212ff45ab59d092055e9e9775231fd8d979643d91d022911bd147 SHA512 28247eb763056becf881f1a3f431a073f4605d062e26bfc30a8cad86cab7b7a9a114a44faff40743957315d808a42ff7636554ff794dac640578ec75e9328749
+DIST openj9-omr-0.48.0.tar.gz 8126272 BLAKE2B d343b0129d639cd2887c98fe64b92c66ff2932537520158faa2dbaa465cfb32d6ff0c5c7bf0a5591a8f57e25f85cfc1a85f34c7f6bd9f07e04a35d5b50eb09f7 SHA512 090aee202bb7dd46fcc93f94a7168d22f3b2546d86456d40ba12aba7d76699345502aafc25ca5b675ba7683cfa2414564113c91ba31ad720d1f6867d63f70aab
+DIST openj9-openjdk-jdk11-openj9-0.48.0.tar.gz 102800187 BLAKE2B 82a04892e389a5e24c59a17d2efa95a37e092480dfbbf89f47da965179aaead0b56c1cbe26efcd905bfeb018667880faf077e410bf0d689a1b99178acf398fb4 SHA512 9288f83706aeb945a479b4478b365911408a92ac703f43418f3f98fc1beaefb008c8d0b46dd055200122a9d549da89cd727a2eef8598b7ba069cf36055d1207d
+DIST openj9-openjdk-jdk21-openj9-0.48.0.tar.gz 100484633 BLAKE2B c23d1325c8db43a7076cc589ea0a485cae2d0d26668f8da5cb2a2db2cc6b43052a7e848d04e7c66f03f7696a19690a0812f9aff92deedf7c426ede03b9aa36c7 SHA512 5b4a390c53643ee10affd5b0c6277f5ac6be873f34035c28fb7b75fca04f9e08e91b66ed505e8a5c0eb114f0cf00d6af2bb8c42f2495e3b6913cc253a7969836
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-11.0.40.0.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-11.0.48.0.ebuild
index 35bc082..4e7eb58 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-11.0.40.0.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-11.0.48.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
+inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
SLOT="$(ver_cut 1)"
OPENJ9_PV="$(ver_cut 2-4)"
@@ -24,7 +24,7 @@ else
"
fi
-LICENSE="GPL-2"
+LICENSE="GPL-2-with-classpath-exception"
KEYWORDS="~amd64"
IUSE="alsa cups ddr debug doc headless-awt javafx +jbootstrap jitserver numa selinux source systemtap"
@@ -41,7 +41,7 @@ COMMON_DEPEND="
media-libs/lcms:2=
sys-libs/zlib
media-libs/libjpeg-turbo:0=
- systemtap? ( dev-util/systemtap )
+ systemtap? ( dev-debug/systemtap )
dev-libs/elfutils
ddr? ( dev-libs/libdwarf )
@@ -162,9 +162,18 @@ src_prepare() {
}
src_configure() {
- # Work around stack alignment issue, bug #647954. in case we ever have x86
+ # Work around stack alignment issue, bug #647954.
use x86 && append-flags -mincoming-stack-boundary=2
+ # Strip some flags users may set, but should not. #818502
+ filter-flags -fexceptions
+
+ # Strip lto related flags, we rely on USE=lto and --with-jvm-features=link-time-opt
+ # https://bugs.gentoo.org/833097
+ # https://bugs.gentoo.org/833098
+ filter-lto
+ filter-flags -fdevirtualize-at-ltrans
+
# Enabling full docs appears to break doc building. If not
# explicitly disabled, the flag will get auto-enabled if pandoc and
# graphviz are detected. pandoc has loads of dependencies anyway.
@@ -202,7 +211,14 @@ src_configure() {
$(use_enable jitserver)
)
+ use lto && myconf+=( --with-jvm-features=link-time-opt )
+
if use javafx; then
+ # this is not useful for users, just for upstream developers
+ # build system compares mesa version in md file
+ # https://bugs.gentoo.org/822612
+ export LEGAL_EXCLUDES=mesa3d.md
+
local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
if [[ -r ${zip} ]]; then
myconf+=( --with-import-modules="${zip}" )
@@ -220,6 +236,10 @@ src_configure() {
}
src_compile() {
+ # Too brittle - gets confused by e.g. -Oline
+ export MAKEOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg)"
+ unset GNUMAKEFLAGS MAKEFLAGS
+
local mycmakeargsx=(
"-DCMAKE_C_FLAGS='${CFLAGS}'"
"-DJ9JIT_EXTRA_CFLAGS='${CFLAGS}'"
@@ -282,6 +302,10 @@ src_install() {
if use doc ; then
docinto html
dodoc -r "${S}"/build/*-release/images/docs/*
- dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
+ dosym -r /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
fi
}
+
+pkg_postinst() {
+ java-vm-2_pkg_postinst
+}
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-17.0.40.0.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-21.0.48.0.ebuild
index ca64ddd..6bf8ca9 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-17.0.40.0.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-21.0.48.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
+inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
SLOT="$(ver_cut 1)"
OPENJ9_PV="$(ver_cut 2-4)"
@@ -24,10 +24,10 @@ else
"
fi
-LICENSE="GPL-2"
+LICENSE="GPL-2-with-classpath-exception"
KEYWORDS="~amd64"
-IUSE="alsa cups ddr debug doc headless-awt javafx +jbootstrap jitserver numa selinux source systemtap"
+IUSE="alsa cups ddr debug doc headless-awt javafx +jbootstrap jitserver lto numa selinux source systemtap"
REQUIRED_USE="
javafx? ( alsa !headless-awt )
@@ -41,7 +41,7 @@ COMMON_DEPEND="
media-libs/lcms:2=
sys-libs/zlib
media-libs/libjpeg-turbo:0=
- systemtap? ( dev-util/systemtap )
+ systemtap? ( dev-debug/systemtap )
dev-libs/elfutils
ddr? ( dev-libs/libdwarf )
@@ -193,6 +193,12 @@ src_configure() {
# Work around stack alignment issue, bug #647954. in case we ever have x86
use x86 && append-flags -mincoming-stack-boundary=2
+ # /tmp/portage/dev-java/openj9-openjdk-21.0.48.0/work/openj9-openjdk-jdk21-openj9-0.48.0/openj9/runtime/codert_vm/thunkcrt.c:95: error: function 'icallVMprJavaSendVirtualL' redeclared as variable
+ # 95 | extern void * icallVMprJavaSendVirtualL;
+ # /tmp/portage/dev-java/openj9-openjdk-21.0.48.0/work/openj9-openjdk-jdk21-openj9-0.48.0/openj9/runtime/compiler/runtime/Runtime.cpp:341:1: note: previously declared here
+ # 341 | JIT_HELPER(icallVMprJavaSendVirtualL);
+ filter-lto
+
# Enabling full docs appears to break doc building. If not
# explicitly disabled, the flag will get auto-enabled if pandoc and
# graphviz are detected. pandoc has loads of dependencies anyway.
@@ -221,7 +227,7 @@ src_configure() {
--with-vendor-version-string="${PVR}"
--with-version-pre=""
--with-zlib=system
- --enable-dtrace=$(usex systemtap yes no)
+ --enable-jvm-feature-dtrace=$(usex systemtap yes no)
--enable-headless-only=$(usex headless-awt yes no)
$(tc-is-clang && echo "--with-toolchain-type=clang")
@@ -230,6 +236,8 @@ src_configure() {
$(use_enable jitserver)
)
+ use lto && myconf+=( --with-jvm-features=link-time-opt )
+
if use javafx; then
local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
if [[ -r ${zip} ]]; then
@@ -269,7 +277,7 @@ src_compile() {
OPENJ9_TAG=${OPENJ9_P}
OPENJ9OMR_SHA=${OPENJ9_P}
)
- emake "${myemakeargs[@]}" -j1 #nowarn
+ emake "${myemakeargs[@]}" -j1
}
src_install() {
@@ -298,7 +306,7 @@ src_install() {
dodir "${dest}"
cp -pPR * "${ddest}" || die
- dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+ dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
# must be done before running itself
java-vm_set-pax-markings "${ddest}"
generated by cgit v1.2.3-70-g09d2 (git 2.49.0) at 2025-05-12 14:52:47 +0000