summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Xu (Hello71) <alex_y_xu@yahoo.ca>2021-04-28 14:33:05 -0400
committerAlex Xu (Hello71) <alex_y_xu@yahoo.ca>2021-04-28 14:33:05 -0400
commit037a2109545b6b40a8c69a4fd554bb9a23b85f3a (patch)
treea3c0d8dc3da97f035a93f0f7bd5698a10583464d
parent9ddaafcdcaac53fa9d5d3e7992e921e63378fb99 (diff)
downloadgentoo-overlay-037a2109545b6b40a8c69a4fd554bb9a23b85f3a.tar.xz
gentoo-overlay-037a2109545b6b40a8c69a4fd554bb9a23b85f3a.zip
dev-java/openj9-openjdk: more fixes
-rw-r--r--dev-java/openj9-openjdk/openj9-openjdk-16.0.26.0.ebuild5
1 files changed, 3 insertions, 2 deletions
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-16.0.26.0.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-16.0.26.0.ebuild
index c92e490..f8b40b6 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-16.0.26.0.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-16.0.26.0.ebuild
@@ -94,7 +94,7 @@ REQUIRED_USE="javafx? ( alsa !headless-awt )"
if [[ ${OPENJ9_PV} == 9999 ]]; then
S="${WORKDIR}/openj9-openjdk-jdk${SLOT}"
else
- S="${WORKDIR}/openj9-openjdk-jdk${SLOT}-${OPENJ9_P}"
+ S="${WORKDIR}/openj9-openjdk-jdk${SLOT}-${OPENJ9_PV}-release"
fi
# The space required to build varies wildly depending on USE flags,
@@ -149,7 +149,8 @@ src_prepare() {
eapply -d omr -- "${FILESDIR}/omr-fam.patch"
if [[ ${OPENJ9_PV} != 9999 ]]; then
- sed -i -e '/^OPENJ9_SHA :=/s/:=.*/:= '${OPENJ9_P}/ \
+ 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