summaryrefslogtreecommitdiff
path: root/dev-java/openj9-openjdk
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java/openj9-openjdk')
-rw-r--r--dev-java/openj9-openjdk/Manifest8
-rw-r--r--dev-java/openj9-openjdk/files/openjdk-src-doubledollar.patch28
-rw-r--r--dev-java/openj9-openjdk/openj9-openjdk-11.0.24.0.ebuild (renamed from dev-java/openj9-openjdk/openj9-openjdk-11.0.23.0.ebuild)4
-rw-r--r--dev-java/openj9-openjdk/openj9-openjdk-11.9999.ebuild4
-rw-r--r--dev-java/openj9-openjdk/openj9-openjdk-15.0.24.0.ebuild (renamed from dev-java/openj9-openjdk/openj9-openjdk-15.0.23.0.ebuild)3
-rw-r--r--dev-java/openj9-openjdk/openj9-openjdk-15.9999.ebuild3
6 files changed, 10 insertions, 40 deletions
diff --git a/dev-java/openj9-openjdk/Manifest b/dev-java/openj9-openjdk/Manifest
index 25edd77..52352f6 100644
--- a/dev-java/openj9-openjdk/Manifest
+++ b/dev-java/openj9-openjdk/Manifest
@@ -1,4 +1,4 @@
-DIST openj9-0.23.0.tar.gz 16294665 BLAKE2B 315224fe6fff758cf9994e9673b3ab744f15803ef6ebfb3c68526bff248a8f64dc87102eef3e65702e15ceeda87ca0c5862d0b87867795f183b0ee63bd3e2638 SHA512 ac14e2a77f0c7cc5b637004fd6fa976730b7dc3f95102fee7ccec233d17836c1bf02790a900702d1c72929191f8cbf458a6ebfd85babc7c292fbb173c7f6e2e3
-DIST openj9-omr-0.23.0.tar.gz 7817276 BLAKE2B 541e377043b311deebb0d0bfb67dbb82911582459a21839b392fe1bf25b6bb3727b129e1ffce8a6219b903d27779b208371c709848de747123ed9ecb00c9b58c SHA512 324d0a715aba7a6ad9da534b4214f7d4fff6abefafdf7214acb2722a3e6f8d01dfb9671362c839e6db9aa2d73430887f7a54ed2d393ad56c19cb9c9526968d46
-DIST openj9-openjdk-jdk11-openj9-0.23.0.tar.gz 104445879 BLAKE2B df045eb377c426153a6010ee02dc6f66b525a32453b7f66cbbe65439a65481145d7506391cf4748b534710792f5396c210aa827efc3a85fa28684e8c2839fdc0 SHA512 905abc83a1a6594dcbd1b5e127404e6fcacfa9478000d46ec1211bbc59558825df884d39437d77102029a7b312043920a865e0b5a0d71640ab1efec41d9e3671
-DIST openj9-openjdk-jdk15-openj9-0.23.0.tar.gz 88610962 BLAKE2B 4c201d46765d360efcb219924f5b0c028f036097bf2fa8a8953a8830bb5c88c2eeae735b26ebfec8e63e728c427be9dadfbc80750587d9ac01916ea10982a59c SHA512 7c7d76302ad7674b1ce3d64f0e1184d9150c3fb433ae5c2176bd1e2d5b22f4c7bd0b157ee3900ffdb32a227f1a0e932e34c677038502e270adfdc018eac3918a
+DIST openj9-0.24.0.tar.gz 16399910 BLAKE2B e2f5e03abe0c87fb175bdbdfd4b1b4b7167460eab1d41f4afe9ede962dfb68c60314262c4cb4dc90360787d67c97e8b9a99cf4b167e249038cd6c4dc0392284e SHA512 c42faa4d10a509d20e14fc915c352f52423cf6f2ec0930a43feb12e910bbbd672bd3a8674851252410c80eb8a7a649198167364e5053bdf4649bf6927189bbd0
+DIST openj9-omr-0.24.0.tar.gz 7799995 BLAKE2B b1937e579d4611dc7bd6d9f747f7e443b5ebbdc108ae3346c7dd494023fa998f9c6d2c0cd5f65dd1fb38d6c3212d4a22fca7b05973135f83b29e26babbb5c959 SHA512 c1cf0366fd1f14436bb66b4c928792a1485330940a6d8fc97be9b7a31bc5c5f28c48d06d7600263d203665ad4882955bb66da2af00ee4e59e57d97c811242be0
+DIST openj9-openjdk-jdk11-openj9-0.24.0.tar.gz 108666016 BLAKE2B 683265b1f26ef2d568cd1df8fae7d20e5e612668f5bdbd624d916a8a0017a71102568e222967a63d88796ca574a21a2c1c3d69dc8e29ab207de74a65290b8ba2 SHA512 e75cd99d20fd672695475d53a42e2843fb90d178744e1fd65fc1b52a0f30b13ab9a2bf7c413a01bea9e45136283039095cc108fe7ead9dca7ade7608dea06e7c
+DIST openj9-openjdk-jdk15-openj9-0.24.0.tar.gz 88602073 BLAKE2B b3cc1abe06f18ff6e8e42905be2611b2fe237105e6ecfe5610c6454a50d10a1ed940b89088444567c59aba5d86eace2263d76f72157cb4034c9371dd6cfed256 SHA512 4f08e79422f41b2bb53041b729c0620912b6b714b6318ff78047594e822f9d495412e522f0b760443ef44f7de42a457b6790f2b6d4853fe11da0704ab54be45e
diff --git a/dev-java/openj9-openjdk/files/openjdk-src-doubledollar.patch b/dev-java/openj9-openjdk/files/openjdk-src-doubledollar.patch
deleted file mode 100644
index c1497d5..0000000
--- a/dev-java/openj9-openjdk/files/openjdk-src-doubledollar.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 0601ac847afc86e9010685bb85d82a00a33355b5 Mon Sep 17 00:00:00 2001
-From: erikj <erik.joelsson@oracle.com>
-Date: Mon, 2 Nov 2020 06:18:08 -0800
-Subject: [PATCH] Add DoubleDollar call to protect java class file names with
- dollar in them
-
----
- make/common/JavaCompilation.gmk | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/make/common/JavaCompilation.gmk b/make/common/JavaCompilation.gmk
-index 444ded0fc06..bedb971115b 100644
---- a/make/common/JavaCompilation.gmk
-+++ b/make/common/JavaCompilation.gmk
-@@ -311,9 +311,11 @@ define SetupJavaCompilationBody
- ifneq ($$($1_KEEP_DUPS), true)
- # Remove duplicate source files by keeping the first found of each duplicate.
- # This allows for automatic overrides with custom or platform specific versions
-- # source files.
-+ # source files. Need to call DoubleDollar as we have java classes with '$' in
-+ # their names.
- $1_SRCS := $$(strip $$(foreach s, $$($1_SRCS), \
-- $$(eval relative_src := $$(call remove-prefixes, $$($1_SRC), $$(s))) \
-+ $$(eval relative_src := $$(call remove-prefixes, $$($1_SRC), \
-+ $$(call DoubleDollar, $$(s)))) \
- $$(if $$($1_$$(relative_src)), \
- , \
- $$(eval $1_$$(relative_src) := 1) $$(s))))
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-11.0.23.0.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-11.0.24.0.ebuild
index 73e6a3e..df02e9d 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-11.0.23.0.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-11.0.24.0.ebuild
@@ -19,8 +19,8 @@ if [[ ${OPENJ9_PV} == 9999 ]]; then
OPENJ9_OMR_EGIT_REPO_URI="https://github.com/eclipse/openj9-omr.git"
else
SRC_URI="
- https://github.com/ibmruntimes/openj9-openjdk-jdk${SLOT}/archive/${OPENJ9_P}.tar.gz -> openj9-openjdk-jdk${SLOT}-${OPENJ9_P}.tar.gz
- https://github.com/eclipse/openj9/archive/${OPENJ9_P}.tar.gz -> ${OPENJ9_P}.tar.gz
+ https://github.com/ibmruntimes/openj9-openjdk-jdk${SLOT}/archive/v${OPENJ9_PV}-release.tar.gz -> openj9-openjdk-jdk${SLOT}-${OPENJ9_P}.tar.gz
+ https://github.com/eclipse/openj9/archive/${OPENJ9_P}.tar.gz
https://github.com/eclipse/openj9-omr/archive/${OPENJ9_P}.tar.gz -> openj9-omr-${OPENJ9_PV}.tar.gz
"
fi
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-11.9999.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-11.9999.ebuild
index 388a762..ead108a 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-11.9999.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-11.9999.ebuild
@@ -19,8 +19,8 @@ if [[ ${OPENJ9_PV} == 9999 ]]; then
OPENJ9_OMR_EGIT_REPO_URI="https://github.com/eclipse/openj9-omr.git"
else
SRC_URI="
- https://github.com/ibmruntimes/openj9-openjdk-jdk${SLOT}/archive/${OPENJ9_P}.tar.gz -> openj9-openjdk-jdk${SLOT}-${OPENJ9_P}.tar.gz
- https://github.com/eclipse/openj9/archive/${OPENJ9_P}.tar.gz -> ${OPENJ9_P}.tar.gz
+ https://github.com/ibmruntimes/openj9-openjdk-jdk${SLOT}/archive/v${OPENJ9_PV}-release.tar.gz -> openj9-openjdk-jdk${SLOT}-${OPENJ9_P}.tar.gz
+ https://github.com/eclipse/openj9/archive/${OPENJ9_P}.tar.gz
https://github.com/eclipse/openj9-omr/archive/${OPENJ9_P}.tar.gz -> openj9-omr-${OPENJ9_PV}.tar.gz
"
fi
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-15.0.23.0.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-15.0.24.0.ebuild
index 23ae86f..585f194 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-15.0.23.0.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-15.0.24.0.ebuild
@@ -19,7 +19,7 @@ if [[ ${OPENJ9_PV} == 9999 ]]; then
OPENJ9_OMR_EGIT_REPO_URI="https://github.com/eclipse/openj9-omr.git"
else
SRC_URI="
- https://github.com/ibmruntimes/openj9-openjdk-jdk${SLOT}/archive/${OPENJ9_P}.tar.gz -> openj9-openjdk-jdk${SLOT}-${OPENJ9_P}.tar.gz
+ https://github.com/ibmruntimes/openj9-openjdk-jdk${SLOT}/archive/v${OPENJ9_PV}-release.tar.gz -> openj9-openjdk-jdk${SLOT}-${OPENJ9_P}.tar.gz
https://github.com/eclipse/openj9/archive/${OPENJ9_P}.tar.gz -> ${OPENJ9_P}.tar.gz
https://github.com/eclipse/openj9-omr/archive/${OPENJ9_P}.tar.gz -> openj9-omr-${OPENJ9_PV}.tar.gz
"
@@ -144,7 +144,6 @@ src_prepare() {
default
- eapply "${FILESDIR}/openjdk-src-doubledollar.patch"
eapply -d omr -- "${FILESDIR}/omr-omrstr-iconv-failure-overflow.patch"
eapply -d omr -- "${FILESDIR}/omr-fam.patch"
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-15.9999.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-15.9999.ebuild
index f1ba818..7b02c94 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-15.9999.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-15.9999.ebuild
@@ -19,7 +19,7 @@ if [[ ${OPENJ9_PV} == 9999 ]]; then
OPENJ9_OMR_EGIT_REPO_URI="https://github.com/eclipse/openj9-omr.git"
else
SRC_URI="
- https://github.com/ibmruntimes/openj9-openjdk-jdk${SLOT}/archive/${OPENJ9_P}.tar.gz -> openj9-openjdk-jdk${SLOT}-${OPENJ9_P}.tar.gz
+ https://github.com/ibmruntimes/openj9-openjdk-jdk${SLOT}/archive/v${OPENJ9_PV}-release.tar.gz -> openj9-openjdk-jdk${SLOT}-${OPENJ9_P}.tar.gz
https://github.com/eclipse/openj9/archive/${OPENJ9_P}.tar.gz -> ${OPENJ9_P}.tar.gz
https://github.com/eclipse/openj9-omr/archive/${OPENJ9_P}.tar.gz -> openj9-omr-${OPENJ9_PV}.tar.gz
"
@@ -144,7 +144,6 @@ src_prepare() {
default
- eapply "${FILESDIR}/openjdk-src-doubledollar.patch"
eapply -d omr -- "${FILESDIR}/omr-omrstr-iconv-failure-overflow.patch"
eapply -d omr -- "${FILESDIR}/omr-fam.patch"
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-21 22:22:43 +0000