From 037a2109545b6b40a8c69a4fd554bb9a23b85f3a Mon Sep 17 00:00:00 2001 From: "Alex Xu (Hello71)" Date: Wed, 28 Apr 2021 14:33:05 -0400 Subject: dev-java/openj9-openjdk: more fixes --- dev-java/openj9-openjdk/openj9-openjdk-16.0.26.0.ebuild | 5 +++-- 1 file 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 -- cgit v1.2.3-70-g09d2