summaryrefslogtreecommitdiff
path: root/dev-java
diff options
context:
space:
mode:
authorAlex Xu (Hello71) <alex_y_xu@yahoo.ca>2022-08-18 18:08:17 -0400
committerAlex Xu (Hello71) <alex_y_xu@yahoo.ca>2022-08-18 18:08:40 -0400
commit093d03da6ec61938a4a5cd672c1e413a2e95c652 (patch)
tree81f22a9a138302e8b60b4768e49197ac25565cbf /dev-java
parent3ccb8d110d5e9ace37b83d650eb2ae04902d6ab0 (diff)
downloadgentoo-overlay-093d03da6ec61938a4a5cd672c1e413a2e95c652.tar.xz
gentoo-overlay-093d03da6ec61938a4a5cd672c1e413a2e95c652.zip
dev-java/openj9-openjdk: upgrade to 0.33.1, sync 11 <- 17
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/openj9-openjdk/Manifest8
-rw-r--r--dev-java/openj9-openjdk/openj9-openjdk-11.0.33.1.ebuild (renamed from dev-java/openj9-openjdk/openj9-openjdk-11.0.33.0.ebuild)15
-rw-r--r--dev-java/openj9-openjdk/openj9-openjdk-17.0.33.1.ebuild (renamed from dev-java/openj9-openjdk/openj9-openjdk-17.0.33.0.ebuild)0
3 files changed, 10 insertions, 13 deletions
diff --git a/dev-java/openj9-openjdk/Manifest b/dev-java/openj9-openjdk/Manifest
index 50bce3a..ffc3344 100644
--- a/dev-java/openj9-openjdk/Manifest
+++ b/dev-java/openj9-openjdk/Manifest
@@ -1,4 +1,4 @@
-DIST openj9-0.33.0.tar.gz 17354965 BLAKE2B 540cdd1bb83da0822229ffed115ea77ece1a7f928e8c74c677a0b1c14c9c3e2c580a6e6fedf90a973eec975054809ad39e6501287fd1fc0a6a770262e127d9a5 SHA512 8cb850e21f51a98701bc5d011ffa8d3918e358f5a7de3bc607fdd4925bda15bf83d5bfa13774fb9e244f092e5996cc6d0a7e6c8e60b44f09ca80772dfcd42216
-DIST openj9-omr-0.33.0.tar.gz 7932215 BLAKE2B 456b185243f9997345df1c4ffacc1579dd10b1667304cf04e2fc455379bd551594a7305a0015e05eccc9b98a0169fda88f9a59da59e05a11307ab3b13e5c1b81 SHA512 b25bf3dcb8cae02c9551a2cb3b9a15107f59471b413dedd6dd622cca7317fc80f80a1e1f9d43d764298a302559e0eee834677eafcf0000b7231c0bb4045fe494
-DIST openj9-openjdk-jdk11-openj9-0.33.0.tar.gz 109330741 BLAKE2B 6d8ff4c4cd090d37290088a23295bb98f45437e8dc62f01af620540043971d4eba34971cf1a301a8b8ae23173ed9397849cb645f0f0fe88982c3e02560b878f6 SHA512 8b778c45bfd2e05b784511a1c4407ea0eabc6bd34702a261fb18820e9b3e57ec8e701b27ea4934e8f46c829c0046a7b3906b356b0c4ed44745d428f3c23acbb6
-DIST openj9-openjdk-jdk17-openj9-0.33.0.tar.gz 94012332 BLAKE2B 7140b409fe19b7d64d76dd5b772d6d5efeb8c8c89ee512498bac464cd63b7e7ad6269fce1d423210efd288224ace8287a06e9f112e1fc9bd5aa3dfeb3202a54e SHA512 7367d436b3266cefc66a59067f27c290e16ab1c92b5614c5b6878f29988fbb59181eafafc68874d0736cd63ecb8dc2e7e45542e6839553a516112aacf3dbcaf0
+DIST openj9-0.33.1.tar.gz 17354965 BLAKE2B c5b9c64ea45eefb2a0c67cd414844e52486481b939b8c62c68444f28f9490ebc2bf04913229576e4fff616b63ef6c242e4748a7ad9dea212714e40d9dbb3bd17 SHA512 fdb75916c868473465687c4fc15eafc1abf02ecff4c88b9998bcbc88e6583868ae3012be89f75734c08b636cf41d04946ec3e7bf29afef0575c8b1146616c9a5
+DIST openj9-omr-0.33.1.tar.gz 7932300 BLAKE2B 9fe2d80119dd7a61058d88ea04220db884e95d781f140247a95014acc80da90783849999f6fbe4e0cfb02e95675265875cbf3dfc1309c09e79226bc4d3b5c603 SHA512 b9322aba18bd487407e77f97a751c9e268577e6a03762070bb7c612276ee149891f6177affb2cabfccdacb2eb1e95c500f4a4473095651cc3f30debe10897d10
+DIST openj9-openjdk-jdk11-openj9-0.33.1.tar.gz 109332234 BLAKE2B c289f81a3fdeb4331fe11f0de7e0a6b78f784025048844b3118e5cff12c68623e989b8d776388956c8c5ed056dd91799d06e20410b0036ca7e50ffdba054eb21 SHA512 fb7e4627d1505887aeb67a1feccd3260f2f997190b9081acd5f22fbad395683e3fbefadab4073b119317744bb7afad54befa7bf9f9ceb15db59c806a5d1e4f81
+DIST openj9-openjdk-jdk17-openj9-0.33.1.tar.gz 94013661 BLAKE2B f5f4155fa3b449b09582782ac2c64a69cd37caa10dd731c6fdb0441b87149f1c867a3d622fd04c242e45a5ad9e07f55c824db1c77baa83493ef7314f63c509b9 SHA512 d5a2cefa683b2ec254db0bf636e02f312db4153c25daff41afdd41c8d8aa529aa87f60476edd229dfb5bb5cb9a67030ab67efac44282f355a9b6d5128a169a2e
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-11.0.33.0.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-11.0.33.1.ebuild
index bf3e716..11e1f9f 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-11.0.33.0.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-11.0.33.1.ebuild
@@ -27,7 +27,7 @@ fi
LICENSE="GPL-2"
KEYWORDS="~amd64"
-IUSE="alsa cups ddr debug doc headless-awt javafx +jbootstrap numa selinux source systemtap"
+IUSE="alsa cups ddr debug doc +gentoo-vm headless-awt javafx +jbootstrap jitserver numa selinux source systemtap"
REQUIRED_USE="
javafx? ( alsa !headless-awt )
@@ -109,6 +109,10 @@ pkg_pretend() {
openjdk_check_requirements
if [[ ${MERGE_TYPE} != binary ]]; then
has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
+
+ if use jitserver && tc-is-clang; then
+ die "jitserver does not compile with clang"
+ fi
fi
}
@@ -151,14 +155,6 @@ src_prepare() {
eapply -d openj9 -- "${FILESDIR}/openj9-no-o3.patch"
eapply -d omr -- "${FILESDIR}/omr-omrstr-iconv-failure-overflow.patch"
- if [[ ${OPENJ9_PV} != 9999 ]]; then
- sed -i -e '/^OPENJDK_SHA :=/s/:=.*/:= __OPENJDK_SHA__/' \
- -e '/^OPENJ9_SHA :=/s/:=.*/:= '${OPENJ9_P}/ \
- -e '/^OPENJ9_TAG :=/s/:=.*/:= '${OPENJ9_P}/ \
- -e '/^OPENJ9OMR_SHA :=/s/:=.*/:= '${OPENJ9_P}/ \
- closed/OpenJ9.gmk || die
- fi
-
find openj9/ omr/ -name CMakeLists.txt -exec sed -i -e '/set(OMR_WARNINGS_AS_ERRORS ON/s/ON/OFF/' {} + || die
sed -i -e '/^ OPENJ9_CONFIGURE_NUMA$/d' closed/autoconf/custom-hook.m4 || die
@@ -203,6 +199,7 @@ src_configure() {
--with-cmake
$(use_enable ddr)
+ $(use_enable jitserver)
)
if use javafx; then
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-17.0.33.0.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-17.0.33.1.ebuild
index 8a7494e..8a7494e 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-17.0.33.0.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-17.0.33.1.ebuild