diff options
Diffstat (limited to 'dev-java/openj9-openjdk')
| -rw-r--r-- | dev-java/openj9-openjdk/Manifest | 8 | ||||
| -rw-r--r-- | dev-java/openj9-openjdk/metadata.xml | 1 | ||||
| -rw-r--r-- | dev-java/openj9-openjdk/openj9-openjdk-11.0.41.0.ebuild (renamed from dev-java/openj9-openjdk/openj9-openjdk-11.0.33.1.ebuild) | 14 | ||||
| -rw-r--r-- | dev-java/openj9-openjdk/openj9-openjdk-17.0.41.0.ebuild (renamed from dev-java/openj9-openjdk/openj9-openjdk-17.0.33.1.ebuild) | 12 |
4 files changed, 19 insertions, 16 deletions
diff --git a/dev-java/openj9-openjdk/Manifest b/dev-java/openj9-openjdk/Manifest index ffc3344..59d3825 100644 --- a/dev-java/openj9-openjdk/Manifest +++ b/dev-java/openj9-openjdk/Manifest @@ -1,4 +1,4 @@ -DIST openj9-0.33.1.tar.gz 17354965 BLAKE2B c5b9c64ea45eefb2a0c67cd414844e52486481b939b8c62c68444f28f9490ebc2bf04913229576e4fff616b63ef6c242e4748a7ad9dea212714e40d9dbb3bd17 SHA512 fdb75916c868473465687c4fc15eafc1abf02ecff4c88b9998bcbc88e6583868ae3012be89f75734c08b636cf41d04946ec3e7bf29afef0575c8b1146616c9a5 -DIST openj9-omr-0.33.1.tar.gz 7932300 BLAKE2B 9fe2d80119dd7a61058d88ea04220db884e95d781f140247a95014acc80da90783849999f6fbe4e0cfb02e95675265875cbf3dfc1309c09e79226bc4d3b5c603 SHA512 b9322aba18bd487407e77f97a751c9e268577e6a03762070bb7c612276ee149891f6177affb2cabfccdacb2eb1e95c500f4a4473095651cc3f30debe10897d10 -DIST openj9-openjdk-jdk11-openj9-0.33.1.tar.gz 109332234 BLAKE2B c289f81a3fdeb4331fe11f0de7e0a6b78f784025048844b3118e5cff12c68623e989b8d776388956c8c5ed056dd91799d06e20410b0036ca7e50ffdba054eb21 SHA512 fb7e4627d1505887aeb67a1feccd3260f2f997190b9081acd5f22fbad395683e3fbefadab4073b119317744bb7afad54befa7bf9f9ceb15db59c806a5d1e4f81 -DIST openj9-openjdk-jdk17-openj9-0.33.1.tar.gz 94013661 BLAKE2B f5f4155fa3b449b09582782ac2c64a69cd37caa10dd731c6fdb0441b87149f1c867a3d622fd04c242e45a5ad9e07f55c824db1c77baa83493ef7314f63c509b9 SHA512 d5a2cefa683b2ec254db0bf636e02f312db4153c25daff41afdd41c8d8aa529aa87f60476edd229dfb5bb5cb9a67030ab67efac44282f355a9b6d5128a169a2e +DIST openj9-0.41.0.tar.gz 18175551 BLAKE2B 691251444980b715b30d2624f6bf9e3964fb848201491f9ac18076ad8d4e354f34ba38affdf55ddf2631ddbd980a5fa4a39a7ac4dab9da8d8cf912711e03009a SHA512 39b5b3d950954183fcfce40398ab7a990a5030e7f403d2e1eb216a914345ec78bcdac14c5c2b24c7ddafcb75a91e267b03c752f88189b537258967f2d191efea +DIST openj9-omr-0.41.0.tar.gz 8058703 BLAKE2B ead5711d9ab0400ddee7798c594585b9bfe73eeb20fc59f191ba062e64005f8c41c4ff8049e58d95cdb5f2175929274ae306c0b4f7938e8c5c8df2f9962d59df SHA512 2429994271f8367204b0e6d75450a7d283dc0fc1166055340a050cf80e06e87d95e3df0607d8d2554fb4adfa712f6ff048fb3d0fb24efed1960e5e3802b7f02d +DIST openj9-openjdk-jdk11-openj9-0.41.0.tar.gz 102514856 BLAKE2B cb1bdc624ae4222ceaac329c5a70ac9f69003bad1dafbd2600fd088538a988b659f368615d5a269c0965caeb14df5b60cf80231d203fbe4a6302ba14a29fccaa SHA512 681a5d636c4672dae489cf71dfd6d9f8879a6ffe795912ecf9fa8f319f2039a16b9db2a75ee69bee9330f2978c411b077d496dc46ff91d9ec4c835f2b32d6142 +DIST openj9-openjdk-jdk17-openj9-0.41.0.tar.gz 95151687 BLAKE2B 4f31f740d3bc568910ec9c0c55b980a51e13272c1fd2d740e019b0fbe1631910e4f961170b26221bcf49d88e47fe0f314ab1182d113581abdecd096f873f71f6 SHA512 5d6e58a317c641b5b73295ee2f3ca63e85d14385640727e949ad06c41dc260fd710eef9f5eac8cb426e1524439359340f2d1ab606c752d77643baeb3201a2d18 diff --git a/dev-java/openj9-openjdk/metadata.xml b/dev-java/openj9-openjdk/metadata.xml index 7148c44..dadf469 100644 --- a/dev-java/openj9-openjdk/metadata.xml +++ b/dev-java/openj9-openjdk/metadata.xml @@ -8,7 +8,6 @@ <use> <flag name="ddr">Enable Direct Dump Reader</flag> <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs</flag> - <flag name="gentoo-vm">Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)</flag> <flag name="javafx">Import OpenJFX modules at build time, via <pkg>dev-java/openjfx</pkg></flag> <flag name="jbootstrap">Build OpenJDK twice, the second time using the result of the first</flag> <flag name="jitserver">OpenJ9 JITServer support</flag> diff --git a/dev-java/openj9-openjdk/openj9-openjdk-11.0.33.1.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-11.0.41.0.ebuild index 11e1f9f..35bc082 100644 --- a/dev-java/openj9-openjdk/openj9-openjdk-11.0.33.1.ebuild +++ b/dev-java/openj9-openjdk/openj9-openjdk-11.0.41.0.ebuild @@ -18,7 +18,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/v${OPENJ9_PV}-release.tar.gz -> openj9-openjdk-jdk${SLOT}-${OPENJ9_P}.tar.gz + 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 https://github.com/eclipse/openj9-omr/archive/${OPENJ9_P}.tar.gz -> openj9-omr-${OPENJ9_PV}.tar.gz " @@ -27,7 +27,7 @@ fi LICENSE="GPL-2" KEYWORDS="~amd64" -IUSE="alsa cups ddr debug doc +gentoo-vm headless-awt javafx +jbootstrap jitserver numa selinux source systemtap" +IUSE="alsa cups ddr debug doc headless-awt javafx +jbootstrap jitserver numa selinux source systemtap" REQUIRED_USE=" javafx? ( alsa !headless-awt ) @@ -83,14 +83,14 @@ DEPEND=" x11-libs/libXtst javafx? ( dev-java/openjfx:${SLOT}= ) || ( - dev-java/openj9-openjdk-bin:${SLOT}[gentoo-vm(+)] - dev-java/openj9-openjdk:${SLOT}[gentoo-vm(+)] - dev-java/openjdk-bin:${SLOT}[gentoo-vm(+)] - dev-java/openjdk:${SLOT}[gentoo-vm(+)] + dev-java/openj9-openjdk-bin:${SLOT} + dev-java/openj9-openjdk:${SLOT} + dev-java/openjdk-bin:${SLOT} + dev-java/openjdk:${SLOT} ) " -S="${WORKDIR}/openj9-openjdk-jdk${SLOT}-${OPENJ9_PV}-release" +S="${WORKDIR}/${PN}-jdk${SLOT}-${OPENJ9_P}" # The space required to build varies wildly depending on USE flags, # ranging from 3GB to 16GB. This function is certainly not exact but diff --git a/dev-java/openj9-openjdk/openj9-openjdk-17.0.33.1.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-17.0.41.0.ebuild index 8a7494e..ca64ddd 100644 --- a/dev-java/openj9-openjdk/openj9-openjdk-17.0.33.1.ebuild +++ b/dev-java/openj9-openjdk/openj9-openjdk-17.0.41.0.ebuild @@ -18,7 +18,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/v${OPENJ9_PV}-release.tar.gz -> openj9-openjdk-jdk${SLOT}-${OPENJ9_P}.tar.gz + 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 https://github.com/eclipse/openj9-omr/archive/${OPENJ9_P}.tar.gz -> openj9-omr-${OPENJ9_PV}.tar.gz " @@ -27,7 +27,7 @@ fi LICENSE="GPL-2" KEYWORDS="~amd64" -IUSE="alsa cups ddr debug doc +gentoo-vm headless-awt javafx +jbootstrap jitserver numa selinux source systemtap" +IUSE="alsa cups ddr debug doc headless-awt javafx +jbootstrap jitserver numa selinux source systemtap" REQUIRED_USE=" javafx? ( alsa !headless-awt ) @@ -90,7 +90,7 @@ DEPEND=" ) " -S="${WORKDIR}/openj9-openjdk-jdk${SLOT}-${OPENJ9_PV}-release" +S="${WORKDIR}/${PN}-jdk${SLOT}-${OPENJ9_P}" # The space required to build varies wildly depending on USE flags, # ranging from 3GB to 16GB. This function is certainly not exact but @@ -303,7 +303,7 @@ src_install() { # must be done before running itself java-vm_set-pax-markings "${ddest}" - use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}.env.sh + java-vm_install-env "${FILESDIR}"/${PN}.env.sh java-vm_revdep-mask java-vm_sandbox-predict /dev/random /proc/self/coredump_filter @@ -313,3 +313,7 @@ src_install() { dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" fi } + +pkg_postinst() { + java-vm-2_pkg_postinst +} |