diff options
Diffstat (limited to 'dev-java/openj9-openjdk-bin')
-rw-r--r-- | dev-java/openj9-openjdk-bin/Manifest | 30 | ||||
-rw-r--r-- | dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin.env.sh | 5 | ||||
-rw-r--r-- | dev-java/openj9-openjdk-bin/metadata.xml | 1 | ||||
-rw-r--r-- | dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.21_p9.ebuild (renamed from dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.17_p8.ebuild) | 6 | ||||
-rw-r--r-- | dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.9_p9.ebuild (renamed from dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.5_p8.ebuild) | 6 | ||||
-rw-r--r-- | dev-java/openj9-openjdk-bin/openj9-openjdk-bin-18.0.2_p9.ebuild | 117 |
6 files changed, 19 insertions, 146 deletions
diff --git a/dev-java/openj9-openjdk-bin/Manifest b/dev-java/openj9-openjdk-bin/Manifest index a9be015..b36e1ce 100644 --- a/dev-java/openj9-openjdk-bin/Manifest +++ b/dev-java/openj9-openjdk-bin/Manifest @@ -1,18 +1,12 @@ -DIST ibm-semeru-open-debugimage_aarch64_linux_11.0.17_8_openj9-0.35.0.tar.gz 266165569 SHA256 56c56a608a017213c7691044dc21b301e0ad14cf4836ade0c530ac3a16511318 -DIST ibm-semeru-open-debugimage_aarch64_linux_17.0.5_8_openj9-0.35.0.tar.gz 278563585 SHA256 d44cadcd0aaf4b43ae2052a5bbfa110086da9b466f0fce08e32c2e938ed741d1 -DIST ibm-semeru-open-debugimage_aarch64_linux_18.0.2_9_openj9-0.33.1.tar.gz 276015436 SHA256 419ad53dea8d29818c923a84f58060dd979beb6231b6ed19f17b1d980d10c235 -DIST ibm-semeru-open-debugimage_ppc64le_linux_11.0.17_8_openj9-0.35.0.tar.gz 334833532 SHA256 76eb77ce53a0241082946b056e191e96f3d090eac391c93569ae1a734aef37ab -DIST ibm-semeru-open-debugimage_ppc64le_linux_17.0.5_8_openj9-0.35.0.tar.gz 349451254 SHA256 d049f1844bac2c17ca708857c02da11e0d8836e18936c0816ca11398325f2217 -DIST ibm-semeru-open-debugimage_ppc64le_linux_18.0.2_9_openj9-0.33.1.tar.gz 343357345 SHA256 ed5005276244a06c51f0ab916ae19ce77536ba1eff6ff329424e10c609a1c015 -DIST ibm-semeru-open-debugimage_x64_linux_11.0.17_8_openj9-0.35.0.tar.gz 343385445 SHA256 a092faaee2fc7dc98549f1c90adc6e97da059fc8b03eb229c9322497fa4ce14f -DIST ibm-semeru-open-debugimage_x64_linux_17.0.5_8_openj9-0.35.0.tar.gz 361884479 SHA256 cfba718579c05ec2ecf43eeff78930d8c4c1feb521187b0519f85ce7a1b6bccd -DIST ibm-semeru-open-debugimage_x64_linux_18.0.2_9_openj9-0.33.1.tar.gz 355530873 SHA256 e0a3fa9021b20ca4d64bab1f4e0c123ab50ee4842fd7b34acae9dfdf642ce12b -DIST ibm-semeru-open-jdk_aarch64_linux_11.0.17_8_openj9-0.35.0.tar.gz 199269440 SHA256 1fb196b4eb3e45e2337883e252955ec56a6cdeb3d7200c95ded75ab0e4f3aefa -DIST ibm-semeru-open-jdk_aarch64_linux_17.0.5_8_openj9-0.35.0.tar.gz 203852153 SHA256 693604e48eef24c20d785f3a7e81e538a30e436ed36b7539a5e23e0008b2c405 -DIST ibm-semeru-open-jdk_aarch64_linux_18.0.2_9_openj9-0.33.1.tar.gz 205000099 SHA256 00e46a2b8be005eb03e3e4d939d4cf9b8331f22ee50ed75b84136d3f0ead7498 -DIST ibm-semeru-open-jdk_ppc64le_linux_11.0.17_8_openj9-0.35.0.tar.gz 204694186 SHA256 b384c25ab6b5ab9787777eff2bceb6c5837765f2d5760055518d9a98810ad93d -DIST ibm-semeru-open-jdk_ppc64le_linux_17.0.5_8_openj9-0.35.0.tar.gz 210025609 SHA256 3158c8e46be057ddacab25a52c2ded470102f994719025ccfa77c23d1106daa9 -DIST ibm-semeru-open-jdk_ppc64le_linux_18.0.2_9_openj9-0.33.1.tar.gz 211212622 SHA256 e111cee65c1487eb3421763f7d0fd69850e0dda34fbe295cae8b15c8219f1647 -DIST ibm-semeru-open-jdk_x64_linux_11.0.17_8_openj9-0.35.0.tar.gz 203782113 SHA256 9c5cbca0a171c7e573047744e9a753923c341f6afb38606ae68f29d6209f2c9c -DIST ibm-semeru-open-jdk_x64_linux_17.0.5_8_openj9-0.35.0.tar.gz 207765361 SHA256 b46de9cd00af8a0223f4b50deb2627ab91fe515a69383a96fd2c12757cef24fe -DIST ibm-semeru-open-jdk_x64_linux_18.0.2_9_openj9-0.33.1.tar.gz 209237550 SHA256 b694d47666035b1f7870bc3749aa7c1903d50976eab3772fd81c32dab2aa8e64 +DIST ibm-semeru-open-debugimage_aarch64_linux_11.0.21_9_openj9-0.41.0.tar.gz 344573477 SHA256 cbeb1b48be7ebe090d7998ff903cdfc120597f0c291e063f2173786ebc4d1e7a +DIST ibm-semeru-open-debugimage_aarch64_linux_17.0.9_9_openj9-0.41.0.tar.gz 359634686 SHA256 d8e0a70145f7f160a1c26ad5196f521bf68ad0ecd6a784faf81ab59868ffb81b +DIST ibm-semeru-open-debugimage_ppc64le_linux_11.0.21_9_openj9-0.41.0.tar.gz 357090764 SHA256 39efd2b530b3061c11c490e75ebbb20a4ec72448aec268bdb8449ee00021a138 +DIST ibm-semeru-open-debugimage_ppc64le_linux_17.0.9_9_openj9-0.41.0.tar.gz 372992490 SHA256 093579d76dda1fff44da05f08a9450d4e435e2f6be5d538113b96ccf0d2a559e +DIST ibm-semeru-open-debugimage_x64_linux_11.0.21_9_openj9-0.41.0.tar.gz 369014125 SHA256 d2cda3fb77f3cad6870f2c868ad4bb3fc6c86e2a82522426a732733ce0fdb2d6 +DIST ibm-semeru-open-debugimage_x64_linux_17.0.9_9_openj9-0.41.0.tar.gz 386149336 SHA256 cf947725632aa736e9bd0e5b7b3f5af9b427f62fdde2b9c16c4aaf3e1231526d +DIST ibm-semeru-open-jdk_aarch64_linux_11.0.21_9_openj9-0.41.0.tar.gz 202866166 SHA256 64f9cc164906b65fb1cb88287d64e40e02371ae1366bce28802d90cbd91df1be +DIST ibm-semeru-open-jdk_aarch64_linux_17.0.9_9_openj9-0.41.0.tar.gz 206857922 SHA256 cfdff21ce44ae6af494cba75c1f323bef83a982f2c11944988bab2125f85b906 +DIST ibm-semeru-open-jdk_ppc64le_linux_11.0.21_9_openj9-0.41.0.tar.gz 206559764 SHA256 c23d62e5e2c3613357f6904cfc9a8229709bbc12d6aeb814875e0c4c471bb350 +DIST ibm-semeru-open-jdk_ppc64le_linux_17.0.9_9_openj9-0.41.0.tar.gz 211958174 SHA256 6934275c8045df881db8693caa219ef566d15f4a0d0b0154583f12370b996c5b +DIST ibm-semeru-open-jdk_x64_linux_11.0.21_9_openj9-0.41.0.tar.gz 205707724 SHA256 d11ec92737b9f97bdd9bb553c3e476981f4ac38039963a15c2e1ca9ec163a304 +DIST ibm-semeru-open-jdk_x64_linux_17.0.9_9_openj9-0.41.0.tar.gz 209702777 SHA256 9b945e58f024108a20eb907015cca4a452332b7644e8dd8e051149a3ec62e3a3 diff --git a/dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin.env.sh b/dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin.env.sh index 2e200d9..f4e3c9a 100644 --- a/dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin.env.sh +++ b/dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin.env.sh @@ -1,7 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -VERSION="AdoptOpenJDK ${DL_PV}" +VERSION="IBM Semeru JDK ${DL_PV}" JAVA_HOME="${EPREFIX}/opt/${P}" JDK_HOME="${EPREFIX}/opt/${P}" JAVAC="\${JAVA_HOME}/bin/javac" diff --git a/dev-java/openj9-openjdk-bin/metadata.xml b/dev-java/openj9-openjdk-bin/metadata.xml index 4c0b1aa..532f0f1 100644 --- a/dev-java/openj9-openjdk-bin/metadata.xml +++ b/dev-java/openj9-openjdk-bin/metadata.xml @@ -8,7 +8,6 @@ </longdescription> <use> <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag> - <flag name="gentoo-vm">Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)</flag> <flag name="source">Install JVM sources</flag> </use> </pkgmetadata> diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.17_p8.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.21_p9.ebuild index 8da6a88..f41e70a 100644 --- a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.17_p8.ebuild +++ b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.21_p9.ebuild @@ -15,7 +15,7 @@ abi_uri() { } JDK_PV=${PV//_p/+} -DL_PV=${JDK_PV}_openj9-0.35.0 +DL_PV=${JDK_PV}_openj9-0.41.0 SLOT=$(ver_cut 1) SRC_URI=" @@ -28,7 +28,7 @@ DESCRIPTION="Prebuilt IBM Semeru JDK binaries provided by IBM" HOMEPAGE="https://developer.ibm.com/languages/java/semeru-runtimes/" LICENSE="GPL-2-with-classpath-exception" KEYWORDS="~amd64 ~arm64 ~ppc64" -IUSE="alsa cups debug +gentoo-vm headless-awt selinux source" +IUSE="alsa cups debug headless-awt selinux source" RDEPEND=" >=sys-apps/baselayout-java-0.1.0-r1 @@ -110,7 +110,7 @@ src_install() { # provide stable symlink dosym "${P}" "/opt/${PN}-${SLOT}" - use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}.env.sh + java-vm_install-env "${FILESDIR}"/${PN}.env.sh java-vm_set-pax-markings "${ddest}" java-vm_revdep-mask java-vm_sandbox-predict /dev/random /proc/self/coredump_filter diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.5_p8.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.9_p9.ebuild index 8da6a88..f41e70a 100644 --- a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.5_p8.ebuild +++ b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.9_p9.ebuild @@ -15,7 +15,7 @@ abi_uri() { } JDK_PV=${PV//_p/+} -DL_PV=${JDK_PV}_openj9-0.35.0 +DL_PV=${JDK_PV}_openj9-0.41.0 SLOT=$(ver_cut 1) SRC_URI=" @@ -28,7 +28,7 @@ DESCRIPTION="Prebuilt IBM Semeru JDK binaries provided by IBM" HOMEPAGE="https://developer.ibm.com/languages/java/semeru-runtimes/" LICENSE="GPL-2-with-classpath-exception" KEYWORDS="~amd64 ~arm64 ~ppc64" -IUSE="alsa cups debug +gentoo-vm headless-awt selinux source" +IUSE="alsa cups debug headless-awt selinux source" RDEPEND=" >=sys-apps/baselayout-java-0.1.0-r1 @@ -110,7 +110,7 @@ src_install() { # provide stable symlink dosym "${P}" "/opt/${PN}-${SLOT}" - use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}.env.sh + java-vm_install-env "${FILESDIR}"/${PN}.env.sh java-vm_set-pax-markings "${ddest}" java-vm_revdep-mask java-vm_sandbox-predict /dev/random /proc/self/coredump_filter diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-18.0.2_p9.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-18.0.2_p9.ebuild deleted file mode 100644 index 83b69ab..0000000 --- a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-18.0.2_p9.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit java-vm-2 toolchain-funcs - -abi_uri() { - echo "${2-$1}? ( - debug? ( - https://github.com/ibmruntimes/semeru${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/ibm-semeru-open-debugimage_${1}_linux_${DL_PV/+/_}.tar.gz - ) - https://github.com/ibmruntimes/semeru${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/ibm-semeru-open-jdk_${1}_linux_${DL_PV/+/_}.tar.gz - )" -} - -JDK_PV=${PV//_p/+} -DL_PV=${JDK_PV}_openj9-0.33.1 -SLOT=$(ver_cut 1) - -SRC_URI=" - $(abi_uri aarch64 arm64) - $(abi_uri ppc64le ppc64) - $(abi_uri x64 amd64) -" - -DESCRIPTION="Prebuilt IBM Semeru JDK binaries provided by IBM" -HOMEPAGE="https://developer.ibm.com/languages/java/semeru-runtimes/" -LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="~amd64 ~arm64 ~ppc64" -IUSE="alsa cups debug +gentoo-vm headless-awt selinux source" - -RDEPEND=" - >=sys-apps/baselayout-java-0.1.0-r1 - kernel_linux? ( - media-libs/fontconfig:1.0 - media-libs/freetype:2 - media-libs/harfbuzz - elibc_glibc? ( >=sys-libs/glibc-2.2.5:* ) - elibc_musl? ( sys-libs/musl ) - sys-libs/zlib - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups ) - selinux? ( sec-policy/selinux-java ) - !headless-awt? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - x11-libs/libXtst - ) - )" - -RESTRICT="preserve-libs splitdebug" -QA_PREBUILT="*" - -S="${WORKDIR}/jdk-${JDK_PV}" - -pkg_pretend() { - if [[ "$(tc-is-softfloat)" != "no" ]]; then - die "These binaries require a hardfloat system." - fi -} - -src_unpack() { - default - if [[ ${A} == *_mac_* ]] ; then - mv -v "${S}/Contents/Home/"* "${S}" || die - rm -Rf "${S}/Contents" # drop macOS executable - fi -} - -src_install() { - local dest="/opt/${P}" - local ddest="${ED}/${dest#/}" - - # on macOS if they would exist they would be called .dylib, but most - # importantly, there are no different providers, so everything - # that's shipped works. - if [[ ${A} != *_mac_* ]] ; then - # Not sure why they bundle this as it's commonly available and they - # only do so on x86_64. It's needed by libfontmanager.so. IcedTea - # also has an explicit dependency while Oracle seemingly dlopens it. - rm -vf lib/libfreetype.so || die - - # prefer system copy # https://bugs.gentoo.org/776676 - rm -vf lib/libharfbuzz.so || die - - # Oracle and IcedTea have libjsoundalsa.so depending on - # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. - if ! use alsa ; then - rm -v lib/libjsound.* || die - fi - - if use headless-awt ; then - rm -v lib/lib*{[jx]awt,splashscreen}* || die - fi - fi - - if ! use source ; then - rm -v lib/src.zip || die - fi - - rm -v lib/security/cacerts || die - dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts - - dodir "${dest}" - cp -pPR * "${ddest}" || die - - # provide stable symlink - dosym "${P}" "/opt/${PN}-${SLOT}" - - use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}.env.sh - java-vm_set-pax-markings "${ddest}" - java-vm_revdep-mask - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter -} |