diff options
| author | Alex Xu (Hello71) <alex_y_xu@yahoo.ca> | 2020-08-01 10:39:09 -0400 |
|---|---|---|
| committer | Alex Xu (Hello71) <alex_y_xu@yahoo.ca> | 2020-08-01 10:39:09 -0400 |
| commit | 3cd6e85a295da0e89e8a1509c7ae89b2c238289d (patch) | |
| tree | b8110075d4a10e6c1bbed569fda31a2e6a9bf9ae /dev-java | |
| parent | 248f62d8345a1c766313dcb805e600f5413cddfa (diff) | |
| download | gentoo-overlay-3cd6e85a295da0e89e8a1509c7ae89b2c238289d.tar.xz gentoo-overlay-3cd6e85a295da0e89e8a1509c7ae89b2c238289d.zip | |
dev-java/openj9-openjdk: fixes
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/openj9-openjdk/openj9-openjdk-11.0.21.0.ebuild | 22 | ||||
| -rw-r--r-- | dev-java/openj9-openjdk/openj9-openjdk-14.0.21.0.ebuild | 22 |
2 files changed, 30 insertions, 14 deletions
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-11.0.21.0.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-11.0.21.0.ebuild index 92fc807..0960297 100644 --- a/dev-java/openj9-openjdk/openj9-openjdk-11.0.21.0.ebuild +++ b/dev-java/openj9-openjdk/openj9-openjdk-11.0.21.0.ebuild @@ -132,16 +132,23 @@ pkg_setup() { fi done - if has_version --host-root dev-java/openjdk:${SLOT}; then - export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT} - else - if [[ ${MERGE_TYPE} != "binary" ]]; then + if [[ ${MERGE_TYPE} != binary ]]; then + if has_version --host-root dev-java/openj9-openjdk:${SLOT}; then + JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openj9-openjdk-${SLOT} + elif has_version --host-root dev-java/openjdk:${SLOT}; then + JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT} + elif has_version --host-root dev-java/openj9-openjdk-bin:${SLOT}; then + JDK_HOME=$(best_version --host-root dev-java/openj9-openjdk-bin:${SLOT}) + JDK_HOME=${JDK_HOME#*/} + JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} + elif has_version --host-root dev-java/openjdk-bin:${SLOT}; then JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT}) - [[ -n ${JDK_HOME} ]] || die "Build VM not found!" JDK_HOME=${JDK_HOME#*/} JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} - export JDK_HOME + else + die "Build VM not found!" fi + export JDK_HOME fi } @@ -248,7 +255,8 @@ src_configure() { src_compile() { local myemakeargs=( JOBS=$(makeopts_jobs) - LOG=debug + # https://github.com/ibmruntimes/openj9-openjdk-jdk14/issues/72 + #LOG=debug CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror $(usex doc docs '') $(usex jbootstrap bootcycle-images product-images) diff --git a/dev-java/openj9-openjdk/openj9-openjdk-14.0.21.0.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-14.0.21.0.ebuild index 255b0b2..a8c5017 100644 --- a/dev-java/openj9-openjdk/openj9-openjdk-14.0.21.0.ebuild +++ b/dev-java/openj9-openjdk/openj9-openjdk-14.0.21.0.ebuild @@ -132,16 +132,23 @@ pkg_setup() { fi done - if has_version --host-root dev-java/openjdk:${SLOT}; then - export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT} - else - if [[ ${MERGE_TYPE} != "binary" ]]; then + if [[ ${MERGE_TYPE} != binary ]]; then + if has_version --host-root dev-java/openj9-openjdk:${SLOT}; then + JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openj9-openjdk-${SLOT} + elif has_version --host-root dev-java/openjdk:${SLOT}; then + JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT} + elif has_version --host-root dev-java/openj9-openjdk-bin:${SLOT}; then + JDK_HOME=$(best_version --host-root dev-java/openj9-openjdk-bin:${SLOT}) + JDK_HOME=${JDK_HOME#*/} + JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} + elif has_version --host-root dev-java/openjdk-bin:${SLOT}; then JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT}) - [[ -n ${JDK_HOME} ]] || die "Build VM not found!" JDK_HOME=${JDK_HOME#*/} JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} - export JDK_HOME + else + die "Build VM not found!" fi + export JDK_HOME fi } @@ -247,7 +254,8 @@ src_configure() { src_compile() { local myemakeargs=( JOBS=$(makeopts_jobs) - LOG=debug + # https://github.com/ibmruntimes/openj9-openjdk-jdk14/issues/72 + #LOG=debug CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror $(usex doc docs '') $(usex jbootstrap bootcycle-images product-images) |