diff options
Diffstat (limited to 'dev-java')
23 files changed, 570 insertions, 718 deletions
diff --git a/dev-java/openj9-openjdk-bin/Manifest b/dev-java/openj9-openjdk-bin/Manifest index d5346b0..998cf94 100644 --- a/dev-java/openj9-openjdk-bin/Manifest +++ b/dev-java/openj9-openjdk-bin/Manifest @@ -1,18 +1,18 @@ -DIST ibm-semeru-open-debugimage_aarch64_linux_11.0.13_8_openj9-0.29.0.tar.gz 258280215 SHA256 0138156b0388f7f06bbe67a6ed982ea7d14a372c5e5d14c6e7d53dc17c58f932 -DIST ibm-semeru-open-debugimage_aarch64_linux_16.0.2_7_openj9-0.27.0.tar.gz 260567193 SHA256 bd8c8f9a07444c5b4c5e88de3bf952d27ef93e1f95485a027d84b4158141593f -DIST ibm-semeru-open-debugimage_ppc64le_linux_11.0.13_8_openj9-0.29.0.tar.gz 312477496 SHA256 f898c2a081a4e3cc56146ab731edf1ede9e72644ad9a5d8a4c5125766260403f -DIST ibm-semeru-open-debugimage_ppc64le_linux_16.0.2_7_openj9-0.27.0.tar.gz 313671311 SHA256 92535ef6c071e6e00dba4988fb4ec2533cb1c27232d1b308cc872043ed4ffc98 -DIST ibm-semeru-open-debugimage_ppc64le_linux_16.0.2_7_openj9-0.27.1.tar.gz 313670254 SHA256 4240e341755efea9e8c7ffb963132b199598de07926cd238e161d31dbd58acda -DIST ibm-semeru-open-debugimage_s390x_linux_11.0.13_8_openj9-0.29.0.tar.gz 276384710 SHA256 7632165750d00ed0ce5c14fcd5e261daf4e7873d53969183189779575e10d8c6 -DIST ibm-semeru-open-debugimage_s390x_linux_16.0.2_7_openj9-0.27.0.tar.gz 279233218 SHA256 b771cd97b91cf9233b5ae3fa4970debac036c434ebce03c833bc73113f03986c -DIST ibm-semeru-open-debugimage_x64_linux_11.0.13_8_openj9-0.29.0.tar.gz 322796284 SHA256 b049b1dfe36079caa937262d5b1c83a7e0e5d88704315e819aac1d1480e0da60 -DIST ibm-semeru-open-debugimage_x64_linux_16.0.2_7_openj9-0.27.0.tar.gz 323689143 SHA256 24a871c4ea86fec1bca82df385ef28d2315703d62c841344839b52a1ac21d6ad -DIST ibm-semeru-open-jdk_aarch64_linux_11.0.13_8_openj9-0.29.0.tar.gz 197781632 SHA256 151dca23e1fdb43eaa60631c96895be9aa7bb751e7fdf88ddffa1c32157fb417 -DIST ibm-semeru-open-jdk_aarch64_linux_16.0.2_7_openj9-0.27.0.tar.gz 200907027 SHA256 022cda1210331488c3db3d0d1282ea74467397fdabc34cb482cdfe81c45f6a15 -DIST ibm-semeru-open-jdk_ppc64le_linux_11.0.13_8_openj9-0.29.0.tar.gz 203079177 SHA256 7b304c52974f51611b45a2ab7949503e33a204b8a4ae705eb3c74789350174d3 -DIST ibm-semeru-open-jdk_ppc64le_linux_16.0.2_7_openj9-0.27.0.tar.gz 206337625 SHA256 d5901996f2c0889b2b92de97fed0b36d5068da308be0fbd6c8293a6b6b91634d -DIST ibm-semeru-open-jdk_ppc64le_linux_16.0.2_7_openj9-0.27.1.tar.gz 206335729 SHA256 edc972a824a8c9993b1403eb33a2148f59d1fd8d6faa5e89582be9d518999441 -DIST ibm-semeru-open-jdk_s390x_linux_11.0.13_8_openj9-0.29.0.tar.gz 199870826 SHA256 6c3ebb4af0f4066e721e1f0078438458775f4b93bfd2d0be1066c54ccf015654 -DIST ibm-semeru-open-jdk_s390x_linux_16.0.2_7_openj9-0.27.0.tar.gz 203152325 SHA256 3a2741a2e14b9934405a6c0b6af9e865687a70814af355e62dd84025707ccfdc -DIST ibm-semeru-open-jdk_x64_linux_11.0.13_8_openj9-0.29.0.tar.gz 202193589 SHA256 3975e2732cf632ca8f41c237ba7e033fd96bda262b79861f83b4e2ac62c90c3d -DIST ibm-semeru-open-jdk_x64_linux_16.0.2_7_openj9-0.27.0.tar.gz 205317058 SHA256 1349eb9a1d9af491a1984d66a80126730357c4a5c4fcbe7112a2c832f6c0886e +DIST ibm-semeru-open-debugimage_aarch64_linux_11.0.27_6_openj9-0.51.0.tar.gz 392541433 SHA256 db6da3a6b41410a4a2e75aa5b733e2500730baa480be0f60f4bf79273e0dabe1 +DIST ibm-semeru-open-debugimage_aarch64_linux_17.0.15_6_openj9-0.51.0.tar.gz 388670023 SHA256 48514a5a6a42589221360a31086ef17962cbffb6161d7e2644c6bada110480d2 +DIST ibm-semeru-open-debugimage_aarch64_linux_21.0.7_6_openj9-0.51.0.tar.gz 392473040 SHA256 ea43a44ca03734f6616e9cddc7c85fac0a46cca094b2ba77e853eac8c9f08e7d +DIST ibm-semeru-open-debugimage_ppc64le_linux_11.0.27_6_openj9-0.51.0.tar.gz 406192866 SHA256 23a3b21a54649fbab4bce711571fbac747ea746782350f11b61b0027a98bd8bd +DIST ibm-semeru-open-debugimage_ppc64le_linux_17.0.15_6_openj9-0.51.0.tar.gz 402615768 SHA256 6f0843adb3685e3a9debf6e18253748c8bf8e309075903a847e99668f44b7e3f +DIST ibm-semeru-open-debugimage_ppc64le_linux_21.0.7_6_openj9-0.51.0.tar.gz 406680845 SHA256 46c066f829cd752fe9d3c35f48df3269f9539655499b0f67c7497a6cb25afb16 +DIST ibm-semeru-open-debugimage_x64_linux_11.0.27_6_openj9-0.51.0.tar.gz 416188045 SHA256 49987b5f8c9cf9d4d9a267c7c735b6e9674608af7c3669765354e0600a552c14 +DIST ibm-semeru-open-debugimage_x64_linux_17.0.15_6_openj9-0.51.0.tar.gz 411832363 SHA256 fadb8e67da8af2201dde91d959f1698e5724b3ec1e4e0f5b8e3482e175fc19f7 +DIST ibm-semeru-open-debugimage_x64_linux_21.0.7_6_openj9-0.51.0.tar.gz 416057502 SHA256 747fa72c225040b1128e9d3311b5f89441730eae43132cf7b1dd4715243c5ae4 +DIST ibm-semeru-open-jdk_aarch64_linux_11.0.27_6_openj9-0.51.0.tar.gz 206134841 SHA256 41aa50c53f899ff3ae49fa84cf5e5ef218b5670ffd3822ed13df136339190417 +DIST ibm-semeru-open-jdk_aarch64_linux_17.0.15_6_openj9-0.51.0.tar.gz 209490355 SHA256 08a982b6fbca457718bc43d14f1e836d7aa93eeaec7cd308793f990f8a5755ed +DIST ibm-semeru-open-jdk_aarch64_linux_21.0.7_6_openj9-0.51.0.tar.gz 223101860 SHA256 a2bd932fc2737f7605172dbfc4f6a1dfa262cbf9606a21cb83ba1ea94c5898e0 +DIST ibm-semeru-open-jdk_ppc64le_linux_11.0.27_6_openj9-0.51.0.tar.gz 216745194 SHA256 e6e9fde688965274b025b998d44a84d03d27428bcb2116dc38ddfd2dd25c7699 +DIST ibm-semeru-open-jdk_ppc64le_linux_17.0.15_6_openj9-0.51.0.tar.gz 220764693 SHA256 41831486054fab00e1ea925b465ee162ba9ad8b65420d50ff7b3dbccd11e1542 +DIST ibm-semeru-open-jdk_ppc64le_linux_21.0.7_6_openj9-0.51.0.tar.gz 234557620 SHA256 7e094e5a25b46452ef2067be50a8b5137a1a00d9fddf47993b0a1f56e70c1632 +DIST ibm-semeru-open-jdk_x64_linux_11.0.27_6_openj9-0.51.0.tar.gz 213541898 SHA256 13aa056c7f6b4bdee89d98b319fc5894f02deb2e019023f44699928281b6df69 +DIST ibm-semeru-open-jdk_x64_linux_17.0.15_6_openj9-0.51.0.tar.gz 217452384 SHA256 7df65eeedda313cd73d28e6f46029f48b96e4d329066f0438b9b2b43aaafad59 +DIST ibm-semeru-open-jdk_x64_linux_21.0.7_6_openj9-0.51.0.tar.gz 231105498 SHA256 70228be801934a3a51761cc6ec5531b4ab52a8942efd2f0f5033ae6b24ae1423 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.13.8.0.29.0.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.13.8.0.29.0.ebuild deleted file mode 100644 index f9a41b7..0000000 --- a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.13.8.0.29.0.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eapi7-ver 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=$(ver_cut 1-3)+$(ver_cut 4) -DL_PV=${JDK_PV}_openj9-$(ver_cut 5-7) -SLOT=$(ver_cut 1) - -SRC_URI=" - $(abi_uri aarch64 arm64) - $(abi_uri ppc64le ppc64) - $(abi_uri s390x s390) - $(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 ~s390" -IUSE="alsa cups debug +gentoo-vm headless-awt selinux source" - -RDEPEND=" - media-libs/fontconfig:1.0 - media-libs/freetype:2 - >=sys-apps/baselayout-java-0.1.0-r1 - >=sys-libs/glibc-2.2.5:* - 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 -} - -do_rm() { - rm -v $1 || die - if use debug ; then - rm -v "${S}-debug-image"/$1 || die - fi -} - -src_install() { - local dest="/opt/${P}" - local ddest="${ED%/}/${dest#/}" - - # Oracle and IcedTea have libjsoundalsa.so depending on - # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. - if ! use alsa ; then - do_rm 'lib/libjsound.*' - fi - - if use headless-awt ; then - do_rm 'lib/lib*{[jx]awt,splashscreen}*' - fi - - if ! use source ; then - rm -v lib/src.zip || die - fi - - rm -v lib/security/cacerts || die - dosym ../../../../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 -} - -pkg_postinst() { - java-vm-2_pkg_postinst - - if use gentoo-vm ; then - ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK" - ewarn "recognised by the system. This will almost certainly break" - ewarn "many java ebuilds as they are not ready for openjdk-11" - else - ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK" - ewarn "will not be recognised by the system. For example, simply calling" - ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" - ewarn "fully supports Java 11. This JDK must therefore be invoked using its" - ewarn "absolute location under ${EPREFIX}/opt/${P}." - fi -} diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.27_p6.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.27_p6.ebuild new file mode 100644 index 0000000..023e8ec --- /dev/null +++ b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.27_p6.ebuild @@ -0,0 +1,117 @@ +# 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.51.0 +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 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}" + + 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-16.0.2.7.0.27.0.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-16.0.2.7.0.27.0.ebuild deleted file mode 100644 index f9a41b7..0000000 --- a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-16.0.2.7.0.27.0.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eapi7-ver 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=$(ver_cut 1-3)+$(ver_cut 4) -DL_PV=${JDK_PV}_openj9-$(ver_cut 5-7) -SLOT=$(ver_cut 1) - -SRC_URI=" - $(abi_uri aarch64 arm64) - $(abi_uri ppc64le ppc64) - $(abi_uri s390x s390) - $(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 ~s390" -IUSE="alsa cups debug +gentoo-vm headless-awt selinux source" - -RDEPEND=" - media-libs/fontconfig:1.0 - media-libs/freetype:2 - >=sys-apps/baselayout-java-0.1.0-r1 - >=sys-libs/glibc-2.2.5:* - 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 -} - -do_rm() { - rm -v $1 || die - if use debug ; then - rm -v "${S}-debug-image"/$1 || die - fi -} - -src_install() { - local dest="/opt/${P}" - local ddest="${ED%/}/${dest#/}" - - # Oracle and IcedTea have libjsoundalsa.so depending on - # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. - if ! use alsa ; then - do_rm 'lib/libjsound.*' - fi - - if use headless-awt ; then - do_rm 'lib/lib*{[jx]awt,splashscreen}*' - fi - - if ! use source ; then - rm -v lib/src.zip || die - fi - - rm -v lib/security/cacerts || die - dosym ../../../../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 -} - -pkg_postinst() { - java-vm-2_pkg_postinst - - if use gentoo-vm ; then - ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK" - ewarn "recognised by the system. This will almost certainly break" - ewarn "many java ebuilds as they are not ready for openjdk-11" - else - ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK" - ewarn "will not be recognised by the system. For example, simply calling" - ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" - ewarn "fully supports Java 11. This JDK must therefore be invoked using its" - ewarn "absolute location under ${EPREFIX}/opt/${P}." - fi -} diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-16.0.2.7.0.27.1.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-16.0.2.7.0.27.1.ebuild deleted file mode 100644 index f146d1f..0000000 --- a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-16.0.2.7.0.27.1.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eapi7-ver 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=$(ver_cut 1-3)+$(ver_cut 4) -DL_PV=${JDK_PV}_openj9-$(ver_cut 5-7) -SLOT=$(ver_cut 1) - -SRC_URI=" - $(abi_uri ppc64le ppc64) -" - -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="-* ~ppc64" -IUSE="alsa cups debug +gentoo-vm headless-awt selinux source" - -RDEPEND=" - media-libs/fontconfig:1.0 - media-libs/freetype:2 - >=sys-apps/baselayout-java-0.1.0-r1 - >=sys-libs/glibc-2.2.5:* - 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 -} - -do_rm() { - rm -v $1 || die - if use debug ; then - rm -v "${S}-debug-image"/$1 || die - fi -} - -src_install() { - local dest="/opt/${P}" - local ddest="${ED%/}/${dest#/}" - - # Oracle and IcedTea have libjsoundalsa.so depending on - # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. - if ! use alsa ; then - do_rm 'lib/libjsound.*' - fi - - if use headless-awt ; then - do_rm 'lib/lib*{[jx]awt,splashscreen}*' - fi - - if ! use source ; then - rm -v lib/src.zip || die - fi - - rm -v lib/security/cacerts || die - dosym ../../../../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 -} - -pkg_postinst() { - java-vm-2_pkg_postinst - - if use gentoo-vm ; then - ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK" - ewarn "recognised by the system. This will almost certainly break" - ewarn "many java ebuilds as they are not ready for openjdk-11" - else - ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK" - ewarn "will not be recognised by the system. For example, simply calling" - ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" - ewarn "fully supports Java 11. This JDK must therefore be invoked using its" - ewarn "absolute location under ${EPREFIX}/opt/${P}." - fi -} diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.15_p6.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.15_p6.ebuild new file mode 100644 index 0000000..023e8ec --- /dev/null +++ b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.15_p6.ebuild @@ -0,0 +1,117 @@ +# 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.51.0 +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 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}" + + 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-21.0.7_p6.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-21.0.7_p6.ebuild new file mode 100644 index 0000000..023e8ec --- /dev/null +++ b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-21.0.7_p6.ebuild @@ -0,0 +1,117 @@ +# 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.51.0 +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 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}" + + 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-jre-bin/Manifest b/dev-java/openj9-openjdk-jre-bin/Manifest index e3eea2f..d3babd8 100644 --- a/dev-java/openj9-openjdk-jre-bin/Manifest +++ b/dev-java/openj9-openjdk-jre-bin/Manifest @@ -1,9 +1,9 @@ -DIST ibm-semeru-open-jre_aarch64_linux_11.0.13_8_openj9-0.29.0.tar.gz 42122642 SHA256 b56f464c2f46aa779897f076edb4c3c37d0280784bcc3b7a46228a32a9e62470 -DIST ibm-semeru-open-jre_aarch64_linux_16.0.2_7_openj9-0.27.0.tar.gz 41451784 SHA256 575dc3827077fc661fd1103effaa13ccd0f1606d01a33643956ed2eb1ece9763 -DIST ibm-semeru-open-jre_ppc64le_linux_11.0.13_8_openj9-0.29.0.tar.gz 44652787 SHA256 3615940d4b26e8d11ff927dbf620a5247caecd84ba24c9d67f0e8b30ff463998 -DIST ibm-semeru-open-jre_ppc64le_linux_16.0.2_7_openj9-0.27.0.tar.gz 44063048 SHA256 51dac9a69b594c72adabb2c36634a121be04a17c4ce34628cf9b37fd5010c1a8 -DIST ibm-semeru-open-jre_ppc64le_linux_16.0.2_7_openj9-0.27.1.tar.gz 44062139 SHA256 4251f3ec4f12a34131f40487b1216238fe3de12179da8e9475bf5fdf7933ccd5 -DIST ibm-semeru-open-jre_s390x_linux_11.0.13_8_openj9-0.29.0.tar.gz 43141369 SHA256 e942c0806163bbabe0b7ec8e630319489da400d58cd390011fc28428f468558e -DIST ibm-semeru-open-jre_s390x_linux_16.0.2_7_openj9-0.27.0.tar.gz 42822005 SHA256 dba28e3e06bb7c76b4da2f46c48ed74dc72e168f9ee01439decadea181eb402c -DIST ibm-semeru-open-jre_x64_linux_11.0.13_8_openj9-0.29.0.tar.gz 43966499 SHA256 78eb54af15fac39eb2d254f51f0302aa213d3ad838f17766a9d081ca783edff4 -DIST ibm-semeru-open-jre_x64_linux_16.0.2_7_openj9-0.27.0.tar.gz 43282252 SHA256 b077cd0b35d3ed1927c22e5b498264ecff67297992809056187b42662edfc536 +DIST ibm-semeru-open-jre_aarch64_linux_11.0.27_6_openj9-0.51.0.tar.gz 47804344 SHA256 7aa093df03eb825d62a72a64a60e238e9fde2d36ed18f6e5418e07318ad155a2 +DIST ibm-semeru-open-jre_aarch64_linux_17.0.15_6_openj9-0.51.0.tar.gz 47146898 SHA256 9a44da58055525719ddb87b2fe21a02562a0897b8b537a65b7a94b1ab28f7eb0 +DIST ibm-semeru-open-jre_aarch64_linux_21.0.7_6_openj9-0.51.0.tar.gz 51681810 SHA256 8a140dc3806d8e0ae23ca37cff6b4cf225eea45bc82b0749c05ad5f05b9cff36 +DIST ibm-semeru-open-jre_ppc64le_linux_11.0.27_6_openj9-0.51.0.tar.gz 52978070 SHA256 81c7c9ee709939cc66d5122f096cd36a4d1630851d275881799746b8f9d050da +DIST ibm-semeru-open-jre_ppc64le_linux_17.0.15_6_openj9-0.51.0.tar.gz 52265472 SHA256 e852a334a4a3f59bd8478ffe3190bbdb520fa37d8954e17fc7842ede979b15fa +DIST ibm-semeru-open-jre_ppc64le_linux_21.0.7_6_openj9-0.51.0.tar.gz 56894775 SHA256 c3e5287710e9a30a905e82cd0bb67a114cec08fc4a03f82798e76d22a1a7137e +DIST ibm-semeru-open-jre_x64_linux_11.0.27_6_openj9-0.51.0.tar.gz 51392477 SHA256 73b79ace5c4e01cf5b0c002799185a5db4a601b3158c690cb204e3b618ad7b6e +DIST ibm-semeru-open-jre_x64_linux_17.0.15_6_openj9-0.51.0.tar.gz 50712179 SHA256 c4cc045bfd63fc6412251fef184c91a1acad76d74ee48561fd48c174fb1278d3 +DIST ibm-semeru-open-jre_x64_linux_21.0.7_6_openj9-0.51.0.tar.gz 55276782 SHA256 1c439bacc90f3a119edc3a7f313512b49b21d583a960cb318094974fe5006246 diff --git a/dev-java/openj9-openjdk-jre-bin/files/openj9-openjdk-jre-bin.env.sh b/dev-java/openj9-openjdk-jre-bin/files/openj9-openjdk-jre-bin.env.sh index 1ad9132..ba4b8a2 100644 --- a/dev-java/openj9-openjdk-jre-bin/files/openj9-openjdk-jre-bin.env.sh +++ b/dev-java/openj9-openjdk-jre-bin/files/openj9-openjdk-jre-bin.env.sh @@ -1,10 +1,5 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -VERSION="AdoptOpenJDK JRE ${DL_PV}" -JAVA_HOME="${EPREFIX}/opt/${P}" -JDK_HOME="${EPREFIX}/opt/${P}" -JAVAC="\${JAVA_HOME}/bin/javac" +VERSION="IBM Semeru JRE ${DL_PV}" +JAVA_HOME="${EPREFIX}/opt/${PN}-${SLOT}" PATH="\${JAVA_HOME}/bin" ROOTPATH="\${JAVA_HOME}/bin" LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/" @@ -13,4 +8,4 @@ PROVIDES_TYPE="JRE" PROVIDES_VERSION="${SLOT}" BOOTCLASSPATH="" GENERATION="2" -ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" +ENV_VARS="JAVA_HOME PATH ROOTPATH LDPATH MANPATH" diff --git a/dev-java/openj9-openjdk-jre-bin/metadata.xml b/dev-java/openj9-openjdk-jre-bin/metadata.xml index b21a054..96526d8 100644 --- a/dev-java/openj9-openjdk-jre-bin/metadata.xml +++ b/dev-java/openj9-openjdk-jre-bin/metadata.xml @@ -8,6 +8,5 @@ </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> </use> </pkgmetadata> diff --git a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-16.0.2.7.0.27.1.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.27_p6.ebuild index b27afba..3f1b111 100644 --- a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-16.0.2.7.0.27.1.ebuild +++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.27_p6.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit eapi7-ver java-vm-2 toolchain-funcs +inherit java-vm-2 abi_uri() { echo "${2-$1}? ( @@ -11,24 +11,25 @@ abi_uri() { )" } -JDK_PV=$(ver_cut 1-3)+$(ver_cut 4) -DL_PV=${JDK_PV}_openj9-$(ver_cut 5-7) +JDK_PV=${PV//_p/+} +DL_PV=${JDK_PV}_openj9-0.51.0 SLOT=$(ver_cut 1) SRC_URI=" + $(abi_uri aarch64 arm64) $(abi_uri ppc64le ppc64) + $(abi_uri x64 amd64) " DESCRIPTION="Prebuilt IBM Semeru JRE binaries provided by IBM" HOMEPAGE="https://developer.ibm.com/languages/java/semeru-runtimes/" LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="~ppc64" -IUSE="alsa cups +gentoo-vm headless-awt selinux" +KEYWORDS="~amd64 ~arm64 ~ppc64" +IUSE="alsa cups headless-awt selinux" RDEPEND=" media-libs/fontconfig:1.0 media-libs/freetype:2 - >net-libs/libnet-1.1 >=sys-apps/baselayout-java-0.1.0-r1 >=sys-libs/glibc-2.2.5:* sys-libs/zlib @@ -49,8 +50,13 @@ QA_PREBUILT="*" S="${WORKDIR}/jdk-${JDK_PV}-jre" src_install() { - local dest="/opt/${P}" - local ddest="${ED%/}/${dest#/}" + local dest="/opt/${PN}-${SLOT}" + local ddest="${ED}/${dest#/}" + + # 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 # Oracle and IcedTea have libjsoundalsa.so depending on # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. @@ -63,15 +69,12 @@ src_install() { fi rm -v lib/security/cacerts || die - dosym ../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts + 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_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 @@ -79,15 +82,4 @@ src_install() { pkg_postinst() { java-vm-2_pkg_postinst - - if use gentoo-vm ; then - ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE" - ewarn "recognised by the system. This will almost certainly break things." - else - ewarn "The experimental gentoo-vm USE flag has not been enabled so this JRE" - ewarn "will not be recognised by the system. For example, simply calling" - ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" - ewarn "fully supports Java 11. This JRE must therefore be invoked using its" - ewarn "absolute location under ${EPREFIX}/opt/${P}." - fi } diff --git a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-16.0.2.7.0.27.0.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.15_p6.ebuild index 110e015..3f1b111 100644 --- a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-16.0.2.7.0.27.0.ebuild +++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.15_p6.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit eapi7-ver java-vm-2 toolchain-funcs +inherit java-vm-2 abi_uri() { echo "${2-$1}? ( @@ -11,27 +11,25 @@ abi_uri() { )" } -JDK_PV=$(ver_cut 1-3)+$(ver_cut 4) -DL_PV=${JDK_PV}_openj9-$(ver_cut 5-7) +JDK_PV=${PV//_p/+} +DL_PV=${JDK_PV}_openj9-0.51.0 SLOT=$(ver_cut 1) SRC_URI=" $(abi_uri aarch64 arm64) $(abi_uri ppc64le ppc64) - $(abi_uri s390x s390) $(abi_uri x64 amd64) " DESCRIPTION="Prebuilt IBM Semeru JRE binaries provided by IBM" HOMEPAGE="https://developer.ibm.com/languages/java/semeru-runtimes/" LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~s390" -IUSE="alsa cups +gentoo-vm headless-awt selinux" +KEYWORDS="~amd64 ~arm64 ~ppc64" +IUSE="alsa cups headless-awt selinux" RDEPEND=" media-libs/fontconfig:1.0 media-libs/freetype:2 - >net-libs/libnet-1.1 >=sys-apps/baselayout-java-0.1.0-r1 >=sys-libs/glibc-2.2.5:* sys-libs/zlib @@ -52,8 +50,13 @@ QA_PREBUILT="*" S="${WORKDIR}/jdk-${JDK_PV}-jre" src_install() { - local dest="/opt/${P}" - local ddest="${ED%/}/${dest#/}" + local dest="/opt/${PN}-${SLOT}" + local ddest="${ED}/${dest#/}" + + # 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 # Oracle and IcedTea have libjsoundalsa.so depending on # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. @@ -66,15 +69,12 @@ src_install() { fi rm -v lib/security/cacerts || die - dosym ../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts + 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_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 @@ -82,15 +82,4 @@ src_install() { pkg_postinst() { java-vm-2_pkg_postinst - - if use gentoo-vm ; then - ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE" - ewarn "recognised by the system. This will almost certainly break things." - else - ewarn "The experimental gentoo-vm USE flag has not been enabled so this JRE" - ewarn "will not be recognised by the system. For example, simply calling" - ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" - ewarn "fully supports Java 11. This JRE must therefore be invoked using its" - ewarn "absolute location under ${EPREFIX}/opt/${P}." - fi } diff --git a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.13.8.0.29.0.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-21.0.7_p6.ebuild index 110e015..3f1b111 100644 --- a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.13.8.0.29.0.ebuild +++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-21.0.7_p6.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit eapi7-ver java-vm-2 toolchain-funcs +inherit java-vm-2 abi_uri() { echo "${2-$1}? ( @@ -11,27 +11,25 @@ abi_uri() { )" } -JDK_PV=$(ver_cut 1-3)+$(ver_cut 4) -DL_PV=${JDK_PV}_openj9-$(ver_cut 5-7) +JDK_PV=${PV//_p/+} +DL_PV=${JDK_PV}_openj9-0.51.0 SLOT=$(ver_cut 1) SRC_URI=" $(abi_uri aarch64 arm64) $(abi_uri ppc64le ppc64) - $(abi_uri s390x s390) $(abi_uri x64 amd64) " DESCRIPTION="Prebuilt IBM Semeru JRE binaries provided by IBM" HOMEPAGE="https://developer.ibm.com/languages/java/semeru-runtimes/" LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~s390" -IUSE="alsa cups +gentoo-vm headless-awt selinux" +KEYWORDS="~amd64 ~arm64 ~ppc64" +IUSE="alsa cups headless-awt selinux" RDEPEND=" media-libs/fontconfig:1.0 media-libs/freetype:2 - >net-libs/libnet-1.1 >=sys-apps/baselayout-java-0.1.0-r1 >=sys-libs/glibc-2.2.5:* sys-libs/zlib @@ -52,8 +50,13 @@ QA_PREBUILT="*" S="${WORKDIR}/jdk-${JDK_PV}-jre" src_install() { - local dest="/opt/${P}" - local ddest="${ED%/}/${dest#/}" + local dest="/opt/${PN}-${SLOT}" + local ddest="${ED}/${dest#/}" + + # 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 # Oracle and IcedTea have libjsoundalsa.so depending on # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. @@ -66,15 +69,12 @@ src_install() { fi rm -v lib/security/cacerts || die - dosym ../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts + 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_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 @@ -82,15 +82,4 @@ src_install() { pkg_postinst() { java-vm-2_pkg_postinst - - if use gentoo-vm ; then - ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE" - ewarn "recognised by the system. This will almost certainly break things." - else - ewarn "The experimental gentoo-vm USE flag has not been enabled so this JRE" - ewarn "will not be recognised by the system. For example, simply calling" - ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" - ewarn "fully supports Java 11. This JRE must therefore be invoked using its" - ewarn "absolute location under ${EPREFIX}/opt/${P}." - fi } diff --git a/dev-java/openj9-openjdk/Manifest b/dev-java/openj9-openjdk/Manifest index 3155083..533a846 100644 --- a/dev-java/openj9-openjdk/Manifest +++ b/dev-java/openj9-openjdk/Manifest @@ -1,4 +1,4 @@ -DIST openj9-0.29.0.tar.gz 16776743 BLAKE2B 524fc53506be1521c07ce6a65ec17419e7d228baa7543342b4011a223c6f2d1e50d80e2d4eee51cc8cfe89bf387ae17a9eb7d28ce61a5d8ff8bc790307061882 SHA512 accfb336b52c94f6988ef47c79c8be3fe841e37611596e61edaad57c801856c53ea248daab41f05a5487873d002f75b3a684588cb81b0fb0270f2638d6d06ed7 -DIST openj9-omr-0.29.0.tar.gz 7852434 BLAKE2B 6f77abbf2597ee4f71aec7eb44e5a9f54c76fde7e3d432415d34c94c84dc00d49c3cd716c6cda4e0fea807b8ba87345b2c94a0014019154a0c60dde4a00db7b1 SHA512 de58cc6b3c2f3d657b8f588151b96acfffc63af274ef6d9c06e5e832c45c246476475c2d40b657c852d2d6f1915ea52095dae89defdaa644cd14f35500e0939f -DIST openj9-openjdk-jdk11-openj9-0.29.0.tar.gz 108964710 BLAKE2B 40526d85b988cbcd04ea254c120fd6cffecd2a1d3ce16e8dde54a3bffad81aea9d78b56804671a79684dfb327f6a8176d15b08e06f1e0b9f64f360c113a2b1b2 SHA512 a033b50bbe49c80c97ecf5f49757913815fcb15c1b8b6574f4039899b254febcbc8deaa49b2e5fd255d5dbcb9fccef9d7778971efa41ea3b0a09a40a0b65c87e -DIST openj9-openjdk-jdk17-openj9-0.29.0.tar.gz 93738465 BLAKE2B b1463c79f6d60f637f14ac3ba34c0c0eb3bf34a0963417bf203221f3dce71c6009bd3970e6d30d9b9156b2bbd9a5dbad837c5925f2bdf4f1e73b548c823dc7a4 SHA512 5f504301f9318afeaa48b3bf65637950604331209e8c2d8e5967eb9861df66eef62afaf9ed6018458fec8a6f4b01bd0f63623664282c06d1b40d560a5a43636e +DIST openj9-0.48.0.tar.gz 18480709 BLAKE2B 4d3d593ce295c0ba40ef32cc79f0e00b4864d2bc5d36e26c0bd0e2c3aa3406888e8a764472c212ff45ab59d092055e9e9775231fd8d979643d91d022911bd147 SHA512 28247eb763056becf881f1a3f431a073f4605d062e26bfc30a8cad86cab7b7a9a114a44faff40743957315d808a42ff7636554ff794dac640578ec75e9328749 +DIST openj9-omr-0.48.0.tar.gz 8126272 BLAKE2B d343b0129d639cd2887c98fe64b92c66ff2932537520158faa2dbaa465cfb32d6ff0c5c7bf0a5591a8f57e25f85cfc1a85f34c7f6bd9f07e04a35d5b50eb09f7 SHA512 090aee202bb7dd46fcc93f94a7168d22f3b2546d86456d40ba12aba7d76699345502aafc25ca5b675ba7683cfa2414564113c91ba31ad720d1f6867d63f70aab +DIST openj9-openjdk-jdk11-openj9-0.48.0.tar.gz 102800187 BLAKE2B 82a04892e389a5e24c59a17d2efa95a37e092480dfbbf89f47da965179aaead0b56c1cbe26efcd905bfeb018667880faf077e410bf0d689a1b99178acf398fb4 SHA512 9288f83706aeb945a479b4478b365911408a92ac703f43418f3f98fc1beaefb008c8d0b46dd055200122a9d549da89cd727a2eef8598b7ba069cf36055d1207d +DIST openj9-openjdk-jdk21-openj9-0.48.0.tar.gz 100484633 BLAKE2B c23d1325c8db43a7076cc589ea0a485cae2d0d26668f8da5cb2a2db2cc6b43052a7e848d04e7c66f03f7696a19690a0812f9aff92deedf7c426ede03b9aa36c7 SHA512 5b4a390c53643ee10affd5b0c6277f5ac6be873f34035c28fb7b75fca04f9e08e91b66ed505e8a5c0eb114f0cf00d6af2bb8c42f2495e3b6913cc253a7969836 diff --git a/dev-java/openj9-openjdk/files/omr-fam.patch b/dev-java/openj9-openjdk/files/omr-fam.patch deleted file mode 100644 index 9141ec1..0000000 --- a/dev-java/openj9-openjdk/files/omr-fam.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff --git a/ddr/tools/blob_reader/blob_reader.cpp b/ddr/tools/blob_reader/blob_reader.cpp -index 028decd0c..a0212609f 100644 ---- a/ddr/tools/blob_reader/blob_reader.cpp -+++ b/ddr/tools/blob_reader/blob_reader.cpp -@@ -85,7 +85,7 @@ struct BlobHeaderV1 { - - struct BlobString { - uint16_t length; -- char data[1]; /* flexible array member */ -+ char data[]; - - void endian_swap() - { -diff --git a/include_core/ute_core.h b/include_core/ute_core.h -index 8b3b1c65d..330ea52c6 100644 ---- a/include_core/ute_core.h -+++ b/include_core/ute_core.h -@@ -125,7 +125,7 @@ typedef struct UtTraceRecord { - uint64_t threadSyn2; /* Thread synonym 2 */ - int32_t firstEntry; /* Offset to first trace entry */ - int32_t nextEntry; /* Offset to next entry */ -- char threadName[1]; /* Thread name */ -+ char threadName[]; /* Thread name */ - } UtTraceRecord; - - /* -diff --git a/include_core/ute_dataformat.h b/include_core/ute_dataformat.h -index 71d9e36ad..8a9dcb487 100644 ---- a/include_core/ute_dataformat.h -+++ b/include_core/ute_dataformat.h -@@ -180,7 +180,7 @@ typedef struct UtProcSection { - #define UT_TRACE_ACTIVE_SECTION_NAME "UTTA" - typedef struct UtActiveSection { - UtDataHeader header; /* Eyecatcher, version etc */ -- char active[1]; /* Trace activation commands */ -+ char active[]; /* Trace activation commands */ - } UtActiveSection; - - /* -@@ -191,7 +191,7 @@ typedef struct UtActiveSection { - #define UT_TRACE_SERVICE_SECTION_NAME "UTSS" - typedef struct UtServiceSection { - UtDataHeader header; /* Eyecatcher, version etc */ -- char level[1]; /* Service level info */ -+ char level[]; /* Service level info */ - } UtServiceSection; - - /* -@@ -202,7 +202,7 @@ typedef struct UtServiceSection { - #define UT_TRACE_STARTUP_SECTION_NAME "UTSO" - typedef struct UtStartupSection { - UtDataHeader header; /* Eyecatcher, version etc */ -- char options[1]; /* Startup options */ -+ char options[]; /* Startup options */ - } UtStartupSection; - - /* -diff --git a/omrtrace/omrtrace_internal.h b/omrtrace/omrtrace_internal.h -index e52347eac..a68a88abd 100644 ---- a/omrtrace/omrtrace_internal.h -+++ b/omrtrace/omrtrace_internal.h -@@ -157,7 +157,7 @@ typedef struct OMR_TraceGlobal OMR_TraceGlobal; - typedef struct UtTraceCfg { - UtDataHeader header; - struct UtTraceCfg *next; /* Next trace config command */ -- char command[1]; /* Start of variable length section */ -+ char command[]; /* Start of variable length section */ - } UtTraceCfg; - - typedef struct UtDeferredConfigInfo { diff --git a/dev-java/openj9-openjdk/files/openj9-no-o3.patch b/dev-java/openj9-openjdk/files/openj9-no-o3.patch index 63d1dcf..b332052 100644 --- a/dev-java/openj9-openjdk/files/openj9-no-o3.patch +++ b/dev-java/openj9-openjdk/files/openj9-no-o3.patch @@ -1,11 +1,10 @@ -diff -ru a/runtime/cmake/platform/toolcfg/gnu.cmake b/runtime/cmake/platform/toolcfg/gnu.cmake ---- a/runtime/cmake/platform/toolcfg/gnu.cmake 2021-07-20 17:24:52.000000000 -0400 -+++ b/runtime/cmake/platform/toolcfg/gnu.cmake 2021-08-07 09:46:15.685325927 -0400 +--- a/runtime/cmake/platform/toolcfg/gnu.cmake ++++ b/runtime/cmake/platform/toolcfg/gnu.cmake @@ -20,7 +20,6 @@ # SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception ################################################################################ -list(APPEND OMR_PLATFORM_COMPILE_OPTIONS -O3 -g -fstack-protector) - list(APPEND OMR_PLATFORM_C_COMPILE_OPTIONS -Wimplicit -Wreturn-type) - list(APPEND OMR_PLATFORM_CXX_COMPILE_OPTIONS -fno-threadsafe-statics) - + if(OMR_DDR AND NOT (CMAKE_C_COMPILER_VERSION VERSION_LESS 11)) + # In gcc 11+ the default is to use DWARF version 5 which is not yet + # supported by ddrgen: tell the compiler to use DWARF version 4. diff --git a/dev-java/openj9-openjdk/files/openj9-openjdk-override-version.patch b/dev-java/openj9-openjdk/files/openj9-openjdk-override-version.patch new file mode 100644 index 0000000..1652627 --- /dev/null +++ b/dev-java/openj9-openjdk/files/openj9-openjdk-override-version.patch @@ -0,0 +1,11 @@ +--- a/closed/OpenJ9.gmk ++++ b/closed/OpenJ9.gmk +@@ -44,7 +44,7 @@ + # $4 - 'required' for a required repository, anything else for an optional one + GetVersion = $(eval $(call GetVersionHelper,$(strip $1),$(strip $2),$(strip $3),$(strip $4))) + define GetVersionHelper +- $2 := $$(if $(wildcard $3),$$(shell $(GIT) -C $3 rev-parse --short HEAD)) ++ $2 := $$(if $$($2),$$($2),$$(if $(wildcard $3),$$(shell $(GIT) -C $3 rev-parse --short HEAD))) + ifneq (,$$($2)) + VersionLabelWidth := $(shell $(ECHO) "$1" | $(AWK) "{ width = length; print (width > $(VersionLabelWidth) ? width : $(VersionLabelWidth)) }") + VersionPairs += "$1" "$$($2)" diff --git a/dev-java/openj9-openjdk/files/openj9-openjdk.env.sh b/dev-java/openj9-openjdk/files/openj9-openjdk.env.sh index 5aac9c7..8d0d130 100644 --- a/dev-java/openj9-openjdk/files/openj9-openjdk.env.sh +++ b/dev-java/openj9-openjdk/files/openj9-openjdk.env.sh @@ -1,6 +1,3 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - VERSION="OpenJDK ${SLOT} with OpenJ9 ${OPENJ9_PV}" JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}" JDK_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}" diff --git a/dev-java/openj9-openjdk/metadata.xml b/dev-java/openj9-openjdk/metadata.xml index 1616443..dadf469 100644 --- a/dev-java/openj9-openjdk/metadata.xml +++ b/dev-java/openj9-openjdk/metadata.xml @@ -7,11 +7,11 @@ </maintainer> <use> <flag name="ddr">Enable Direct Dump Reader</flag> - <flag name="custom-optimization">Override OpenJDK and OpenJ9 per-module optimization flags</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> + <flag name="numa">Enable NUMA support using sys-process/numactl (NUMA kernel support is also required)</flag> <flag name="systemtap">Enable SystemTAP/DTrace tracing</flag> </use> </pkgmetadata> diff --git a/dev-java/openj9-openjdk/openj9-openjdk-17.0.29.0.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-11.0.48.0.ebuild index 5b50139..4e7eb58 100644 --- a/dev-java/openj9-openjdk/openj9-openjdk-17.0.29.0.ebuild +++ b/dev-java/openj9-openjdk/openj9-openjdk-11.0.48.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs +inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs SLOT="$(ver_cut 1)" OPENJ9_PV="$(ver_cut 2-4)" @@ -18,16 +18,20 @@ 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/eclipse/openj9/archive/${OPENJ9_P}.tar.gz -> ${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 " fi -LICENSE="GPL-2" +LICENSE="GPL-2-with-classpath-exception" KEYWORDS="~amd64" -IUSE="alsa cups custom-optimization ddr debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap" +IUSE="alsa cups ddr debug doc headless-awt javafx +jbootstrap jitserver numa selinux source systemtap" + +REQUIRED_USE=" + javafx? ( alsa !headless-awt ) +" COMMON_DEPEND=" media-libs/freetype:2= @@ -36,12 +40,12 @@ COMMON_DEPEND=" media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib - virtual/jpeg:0= - systemtap? ( dev-util/systemtap ) + media-libs/libjpeg-turbo:0= + systemtap? ( dev-debug/systemtap ) dev-libs/elfutils - dev-libs/libdwarf - sys-process/numactl + ddr? ( dev-libs/libdwarf ) + numa? ( sys-process/numactl ) " # Many libs are required to build, but not to run, make is possible to remove @@ -86,9 +90,7 @@ DEPEND=" ) " -REQUIRED_USE="javafx? ( alsa !headless-awt )" - -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 @@ -107,6 +109,10 @@ pkg_pretend() { openjdk_check_requirements if [[ ${MERGE_TYPE} != binary ]]; then has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876" + + if use jitserver && tc-is-clang; then + die "jitserver does not compile with clang" + fi fi } @@ -114,45 +120,13 @@ pkg_setup() { openjdk_check_requirements java-vm-2_pkg_setup + [[ ${MERGE_TYPE} == "binary" ]] && return + JAVA_PKG_WANT_BUILD_VM="openj9-openjdk-${SLOT} openj9-openjdk-bin-${SLOT} openjdk-${SLOT} openjdk-bin-${SLOT}" JAVA_PKG_WANT_SOURCE="${SLOT}" JAVA_PKG_WANT_TARGET="${SLOT}" - # The nastiness below is necessary while the gentoo-vm USE flag is - # masked. First we call java-pkg-2_pkg_setup if it looks like the - # flag was unmasked against one of the possible build VMs. If not, - # we try finding one of them in their expected locations. This would - # have been slightly less messy if openjdk-bin had been installed to - # /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env - # file but disable it so that it would not normally be selectable. - - local vm - for vm in ${JAVA_PKG_WANT_BUILD_VM}; do - if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then - java-pkg-2_pkg_setup - return - fi - done - - if [[ ${MERGE_TYPE} != binary ]]; then - if [[ -z ${JDK_HOME} ]]; then - for slot in ${SLOT} $((SLOT-1)); do - for variant in openj9- ''; do - if has_version --host-root dev-java/${variant}openjdk:${slot}; then - JDK_HOME=${EPREFIX}/usr/$(get_libdir)/${variant}openjdk-${slot} - break - elif has_version --host-root dev-java/${variant}openjdk-bin:${slot}; then - JDK_HOME=$(best_version --host-root dev-java/${variant}openjdk-bin:${slot}) - JDK_HOME=${JDK_HOME#*/} - JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} - break - fi - done - done - fi - [[ -n ${JDK_HOME} ]] || die "Build VM not found!" - export JDK_HOME - fi + java-pkg-2_pkg_setup } src_unpack() { @@ -177,28 +151,28 @@ src_prepare() { default + eapply -- "${FILESDIR}/openj9-openjdk-override-version.patch" eapply -d openj9 -- "${FILESDIR}/openj9-no-o3.patch" eapply -d omr -- "${FILESDIR}/omr-omrstr-iconv-failure-overflow.patch" - eapply -d omr -- "${FILESDIR}/omr-fam.patch" - - if [[ ${OPENJ9_PV} != 9999 ]]; then - 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 || die - fi find openj9/ omr/ -name CMakeLists.txt -exec sed -i -e '/set(OMR_WARNINGS_AS_ERRORS ON/s/ON/OFF/' {} + || die + sed -i -e '/^ OPENJ9_CONFIGURE_NUMA$/d' closed/autoconf/custom-hook.m4 || die chmod +x configure || die } src_configure() { - # Work around stack alignment issue, bug #647954. in case we ever have x86 + # Work around stack alignment issue, bug #647954. use x86 && append-flags -mincoming-stack-boundary=2 - use custom-optimization || filter-flags '-O*' + # Strip some flags users may set, but should not. #818502 + filter-flags -fexceptions + + # Strip lto related flags, we rely on USE=lto and --with-jvm-features=link-time-opt + # https://bugs.gentoo.org/833097 + # https://bugs.gentoo.org/833098 + filter-lto + filter-flags -fdevirtualize-at-ltrans # Enabling full docs appears to break doc building. If not # explicitly disabled, the flag will get auto-enabled if pandoc and @@ -206,6 +180,7 @@ src_configure() { local myconf=( --disable-ccache + --disable-precompiled-headers --disable-warnings-as-errors{,-omr,-openj9} --enable-full-docs=no --with-boot-jdk="${JDK_HOME}" @@ -226,7 +201,6 @@ src_configure() { --with-vendor-vm-bug-url="https://bugs.openjdk.java.net" --with-vendor-version-string="${PVR}" --with-version-pre="" - --with-version-opt="" --with-zlib=system --enable-dtrace=$(usex systemtap yes no) --enable-headless-only=$(usex headless-awt yes no) @@ -234,10 +208,18 @@ src_configure() { --with-cmake $(use_enable ddr) + $(use_enable jitserver) ) + use lto && myconf+=( --with-jvm-features=link-time-opt ) + if use javafx; then - local zip="${EPREFIX%/}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip" + # this is not useful for users, just for upstream developers + # build system compares mesa version in md file + # https://bugs.gentoo.org/822612 + export LEGAL_EXCLUDES=mesa3d.md + + local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip" if [[ -r ${zip} ]]; then myconf+=( --with-import-modules="${zip}" ) else @@ -245,13 +227,6 @@ src_configure() { fi fi - # PaX breaks pch, bug #601016 - if use pch && ! host-is-pax; then - myconf+=( --enable-precompiled-headers ) - else - myconf+=( --disable-precompiled-headers ) - fi - ( unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS CFLAGS= CXXFLAGS= LDFLAGS= \ @@ -261,6 +236,10 @@ src_configure() { } src_compile() { + # Too brittle - gets confused by e.g. -Oline + export MAKEOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg)" + unset GNUMAKEFLAGS MAKEFLAGS + local mycmakeargsx=( "-DCMAKE_C_FLAGS='${CFLAGS}'" "-DJ9JIT_EXTRA_CFLAGS='${CFLAGS}'" @@ -268,6 +247,7 @@ src_compile() { "-DJ9JIT_EXTRA_CXXFLAGS='${CXXFLAGS}'" "-DCMAKE_EXE_LINKER_FLAGS='${LDFLAGS}'" -DOMR_WARNINGS_AS_ERRORS=OFF + -DOMR_PORT_NUMA_SUPPORT=$(usex numa) ) local myemakeargs=( JOBS=$(makeopts_jobs) @@ -276,13 +256,17 @@ src_compile() { $(usex jbootstrap bootcycle-images product-images) EXTRA_CMAKE_ARGS="${mycmakeargsx[*]}" + OPENJDK_SHA=$(ver_cut 1-3) + OPENJ9_SHA=${OPENJ9_P} + OPENJ9_TAG=${OPENJ9_P} + OPENJ9OMR_SHA=${OPENJ9_P} ) emake "${myemakeargs[@]}" -j1 #nowarn } src_install() { local dest="/usr/$(get_libdir)/${PN}-${SLOT}" - local ddest="${ED}${dest#/}" + local ddest="${ED}/${dest#/}" cd "${S}"/build/*-release/images/jdk || die @@ -297,10 +281,6 @@ src_install() { rm -v lib/libjsound.* || die fi - if ! use examples ; then - rm -vr demo/ || die - fi - if ! use source ; then rm -v lib/src.zip || die fi @@ -310,34 +290,22 @@ src_install() { dodir "${dest}" cp -pPR * "${ddest}" || die - dosym ../../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts + dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts # 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 if use doc ; then docinto html dodoc -r "${S}"/build/*-release/images/docs/* - dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" + dosym -r /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" fi } pkg_postinst() { java-vm-2_pkg_postinst - - if use gentoo-vm ; then - ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK" - ewarn "recognised by the system. This will almost certainly break" - ewarn "many java ebuilds as they are not ready for openjdk-${SLOT}" - else - ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK" - ewarn "will not be recognised by the system. For example, simply calling" - ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" - ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its" - ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}." - fi } diff --git a/dev-java/openj9-openjdk/openj9-openjdk-11.0.29.0.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-21.0.48.0.ebuild index ab236c7..6bf8ca9 100644 --- a/dev-java/openj9-openjdk/openj9-openjdk-11.0.29.0.ebuild +++ b/dev-java/openj9-openjdk/openj9-openjdk-21.0.48.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs +inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs SLOT="$(ver_cut 1)" OPENJ9_PV="$(ver_cut 2-4)" @@ -18,16 +18,20 @@ 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/eclipse/openj9/archive/${OPENJ9_P}.tar.gz -> ${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 " fi -LICENSE="GPL-2" +LICENSE="GPL-2-with-classpath-exception" KEYWORDS="~amd64" -IUSE="alsa cups custom-optimization ddr debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap" +IUSE="alsa cups ddr debug doc headless-awt javafx +jbootstrap jitserver lto numa selinux source systemtap" + +REQUIRED_USE=" + javafx? ( alsa !headless-awt ) +" COMMON_DEPEND=" media-libs/freetype:2= @@ -36,12 +40,12 @@ COMMON_DEPEND=" media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib - virtual/jpeg:0= - systemtap? ( dev-util/systemtap ) + media-libs/libjpeg-turbo:0= + systemtap? ( dev-debug/systemtap ) dev-libs/elfutils - dev-libs/libdwarf - sys-process/numactl + ddr? ( dev-libs/libdwarf ) + numa? ( sys-process/numactl ) " # Many libs are required to build, but not to run, make is possible to remove @@ -86,9 +90,7 @@ DEPEND=" ) " -REQUIRED_USE="javafx? ( alsa !headless-awt )" - -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 @@ -107,6 +109,10 @@ pkg_pretend() { openjdk_check_requirements if [[ ${MERGE_TYPE} != binary ]]; then has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876" + + if use jitserver && tc-is-clang; then + die "jitserver does not compile with clang" + fi fi } @@ -114,6 +120,8 @@ pkg_setup() { openjdk_check_requirements java-vm-2_pkg_setup + [[ ${MERGE_TYPE} == "binary" ]] && return + JAVA_PKG_WANT_BUILD_VM="openj9-openjdk-${SLOT} openj9-openjdk-bin-${SLOT} openjdk-${SLOT} openjdk-bin-${SLOT}" JAVA_PKG_WANT_SOURCE="${SLOT}" JAVA_PKG_WANT_TARGET="${SLOT}" @@ -128,31 +136,11 @@ pkg_setup() { local vm for vm in ${JAVA_PKG_WANT_BUILD_VM}; do - if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then + if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then java-pkg-2_pkg_setup return fi done - - if [[ ${MERGE_TYPE} != binary ]]; then - if [[ -z ${JDK_HOME} ]]; then - for slot in ${SLOT} $((SLOT-1)); do - for variant in openj9- ''; do - if has_version --host-root dev-java/${variant}openjdk:${slot}; then - JDK_HOME=${EPREFIX}/usr/$(get_libdir)/${variant}openjdk-${slot} - break - elif has_version --host-root dev-java/${variant}openjdk-bin:${slot}; then - JDK_HOME=$(best_version --host-root dev-java/${variant}openjdk-bin:${slot}) - JDK_HOME=${JDK_HOME#*/} - JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} - break - fi - done - done - fi - [[ -n ${JDK_HOME} ]] || die "Build VM not found!" - export JDK_HOME - fi } src_unpack() { @@ -177,28 +165,39 @@ src_prepare() { default + eapply -- "${FILESDIR}/openj9-openjdk-override-version.patch" eapply -d openj9 -- "${FILESDIR}/openj9-no-o3.patch" eapply -d omr -- "${FILESDIR}/omr-omrstr-iconv-failure-overflow.patch" - eapply -d omr -- "${FILESDIR}/omr-fam.patch" - - if [[ ${OPENJ9_PV} != 9999 ]]; then - 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 || die - fi find openj9/ omr/ -name CMakeLists.txt -exec sed -i -e '/set(OMR_WARNINGS_AS_ERRORS ON/s/ON/OFF/' {} + || die + sed -i -e '/^ OPENJ9_CONFIGURE_NUMA$/d' closed/autoconf/custom-hook.m4 || die chmod +x configure || die } src_configure() { + for variant in openj9- ''; do + if has_version dev-java/${variant}openjdk:${SLOT}; then + JDK_HOME=${EPREFIX}/usr/$(get_libdir)/${variant}openjdk-${SLOT} + break + elif has_version dev-java/${variant}openjdk-bin:${SLOT}; then + JDK_HOME=$(best_version dev-java/${variant}openjdk-bin:${SLOT}) + JDK_HOME=${JDK_HOME#*/} + JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} + break + fi + done + [[ -n ${JDK_HOME} ]] || die "Build VM not found!" + export JDK_HOME + # Work around stack alignment issue, bug #647954. in case we ever have x86 use x86 && append-flags -mincoming-stack-boundary=2 - use custom-optimization || filter-flags '-O*' + # /tmp/portage/dev-java/openj9-openjdk-21.0.48.0/work/openj9-openjdk-jdk21-openj9-0.48.0/openj9/runtime/codert_vm/thunkcrt.c:95: error: function 'icallVMprJavaSendVirtualL' redeclared as variable + # 95 | extern void * icallVMprJavaSendVirtualL; + # /tmp/portage/dev-java/openj9-openjdk-21.0.48.0/work/openj9-openjdk-jdk21-openj9-0.48.0/openj9/runtime/compiler/runtime/Runtime.cpp:341:1: note: previously declared here + # 341 | JIT_HELPER(icallVMprJavaSendVirtualL); + filter-lto # Enabling full docs appears to break doc building. If not # explicitly disabled, the flag will get auto-enabled if pandoc and @@ -206,6 +205,7 @@ src_configure() { local myconf=( --disable-ccache + --disable-precompiled-headers --disable-warnings-as-errors{,-omr,-openj9} --enable-full-docs=no --with-boot-jdk="${JDK_HOME}" @@ -226,18 +226,20 @@ src_configure() { --with-vendor-vm-bug-url="https://bugs.openjdk.java.net" --with-vendor-version-string="${PVR}" --with-version-pre="" - --with-version-opt="" --with-zlib=system - --enable-dtrace=$(usex systemtap yes no) + --enable-jvm-feature-dtrace=$(usex systemtap yes no) --enable-headless-only=$(usex headless-awt yes no) $(tc-is-clang && echo "--with-toolchain-type=clang") --with-cmake $(use_enable ddr) + $(use_enable jitserver) ) + use lto && myconf+=( --with-jvm-features=link-time-opt ) + if use javafx; then - local zip="${EPREFIX%/}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip" + local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip" if [[ -r ${zip} ]]; then myconf+=( --with-import-modules="${zip}" ) else @@ -245,13 +247,6 @@ src_configure() { fi fi - # PaX breaks pch, bug #601016 - if use pch && ! host-is-pax; then - myconf+=( --enable-precompiled-headers ) - else - myconf+=( --disable-precompiled-headers ) - fi - ( unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS CFLAGS= CXXFLAGS= LDFLAGS= \ @@ -268,6 +263,7 @@ src_compile() { "-DJ9JIT_EXTRA_CXXFLAGS='${CXXFLAGS}'" "-DCMAKE_EXE_LINKER_FLAGS='${LDFLAGS}'" -DOMR_WARNINGS_AS_ERRORS=OFF + -DOMR_PORT_NUMA_SUPPORT=$(usex numa) ) local myemakeargs=( JOBS=$(makeopts_jobs) @@ -276,13 +272,17 @@ src_compile() { $(usex jbootstrap bootcycle-images product-images) EXTRA_CMAKE_ARGS="${mycmakeargsx[*]}" + OPENJDK_SHA=$(ver_cut 1-3) + OPENJ9_SHA=${OPENJ9_P} + OPENJ9_TAG=${OPENJ9_P} + OPENJ9OMR_SHA=${OPENJ9_P} ) - emake "${myemakeargs[@]}" -j1 #nowarn + emake "${myemakeargs[@]}" -j1 } src_install() { local dest="/usr/$(get_libdir)/${PN}-${SLOT}" - local ddest="${ED}${dest#/}" + local ddest="${ED}/${dest#/}" cd "${S}"/build/*-release/images/jdk || die @@ -297,10 +297,6 @@ src_install() { rm -v lib/libjsound.* || die fi - if ! use examples ; then - rm -vr demo/ || die - fi - if ! use source ; then rm -v lib/src.zip || die fi @@ -310,12 +306,12 @@ src_install() { dodir "${dest}" cp -pPR * "${ddest}" || die - dosym ../../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts + dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts # 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 @@ -328,16 +324,4 @@ src_install() { pkg_postinst() { java-vm-2_pkg_postinst - - if use gentoo-vm ; then - ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK" - ewarn "recognised by the system. This will almost certainly break" - ewarn "many java ebuilds as they are not ready for openjdk-11" - else - ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK" - ewarn "will not be recognised by the system. For example, simply calling" - ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" - ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its" - ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}." - fi } |