diff options
| author | Alex Xu (Hello71) <alex_y_xu@yahoo.ca> | 2021-10-21 11:07:14 -0400 |
|---|---|---|
| committer | Alex Xu (Hello71) <alex_y_xu@yahoo.ca> | 2021-10-21 11:07:14 -0400 |
| commit | b41cad055fb9e4d39f23dfbe91babba8f36c4762 (patch) | |
| tree | 6590bd7ba583f8ab5872700e6dcacc3530a995c2 | |
| parent | 0be0e2968a9d4e370a2c5d8506bb7b7218bc126e (diff) | |
| download | gentoo-overlay-b41cad055fb9e4d39f23dfbe91babba8f36c4762.tar.xz gentoo-overlay-b41cad055fb9e4d39f23dfbe91babba8f36c4762.zip | |
dev-java/openj9-openjdk: fixes
| -rw-r--r-- | dev-java/openj9-openjdk/openj9-openjdk-11.0.29.0.ebuild | 4 | ||||
| -rw-r--r-- | dev-java/openj9-openjdk/openj9-openjdk-17.0.29.0.ebuild | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-11.0.29.0.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-11.0.29.0.ebuild index bda42bb..f855f71 100644 --- a/dev-java/openj9-openjdk/openj9-openjdk-11.0.29.0.ebuild +++ b/dev-java/openj9-openjdk/openj9-openjdk-11.0.29.0.ebuild @@ -92,7 +92,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, @@ -195,7 +195,7 @@ src_prepare() { closed/OpenJ9.gmk || die fi - find openj9/ omr/ -name CMakeLists.txt -exec grep -l 'set(OMR_WARNINGS_AS_ERRORS ON' {} + | xargs sed -i -e '/set(OMR_WARNINGS_AS_ERRORS ON/s/ON/OFF/' || die + find openj9/ omr/ -name CMakeLists.txt -exec sed -i -e '/set(OMR_WARNINGS_AS_ERRORS ON/s/ON/OFF/' {} + || die chmod +x configure || die } diff --git a/dev-java/openj9-openjdk/openj9-openjdk-17.0.29.0.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-17.0.29.0.ebuild index 8e03257..611a075 100644 --- a/dev-java/openj9-openjdk/openj9-openjdk-17.0.29.0.ebuild +++ b/dev-java/openj9-openjdk/openj9-openjdk-17.0.29.0.ebuild @@ -195,7 +195,7 @@ src_prepare() { closed/OpenJ9.gmk || die fi - find openj9/ omr/ -name CMakeLists.txt -exec grep -l 'set(OMR_WARNINGS_AS_ERRORS ON' {} + | xargs sed -i -e '/set(OMR_WARNINGS_AS_ERRORS ON/s/ON/OFF/' || die + find openj9/ omr/ -name CMakeLists.txt -exec sed -i -e '/set(OMR_WARNINGS_AS_ERRORS ON/s/ON/OFF/' {} + || die chmod +x configure || die } |