summaryrefslogtreecommitdiff
path: root/dev-java
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/openj9-openjdk/Manifest8
-rw-r--r--dev-java/openj9-openjdk/openj9-openjdk-11.0.29.0.ebuild (renamed from dev-java/openj9-openjdk/openj9-openjdk-11.0.27.1.ebuild)28
-rw-r--r--dev-java/openj9-openjdk/openj9-openjdk-17.0.29.0.ebuild (renamed from dev-java/openj9-openjdk/openj9-openjdk-16.0.27.1.ebuild)69
3 files changed, 85 insertions, 20 deletions
diff --git a/dev-java/openj9-openjdk/Manifest b/dev-java/openj9-openjdk/Manifest
index 89d0bef..3155083 100644
--- a/dev-java/openj9-openjdk/Manifest
+++ b/dev-java/openj9-openjdk/Manifest
@@ -1,4 +1,4 @@
-DIST openj9-0.27.1.tar.gz 16668711 BLAKE2B 091047b3770d86b652042b49f419c4d4597bb13630b853223a909fa0a135b0252d280e9ba2f1735c9f1c02dceb33a997e7906464d83669cd20d7993766ac46fc SHA512 1ba28787cf92eafb0e789ecac33b0f772bea6d4856f6120befe9c1928a8dcac04569808b053209fafa09a097c32fd3eed2c6c7137250a4e8b6cb96d37e4eec4e
-DIST openj9-omr-0.27.1.tar.gz 7815053 BLAKE2B 97d4481dbcd8643e95e2ff50b873f1018c297dff0140207c3352ba5c5395092d21a1b2abcb5796f4d96daf4635f3a86cf76fab8376457fca7f8d1f4692ff9b03 SHA512 980d13ad900aec0d644058f3738f53b29467f4fbda03a2094ccceaa34955e79165002dc2d441af0fe878b523f62b15d315375dea2d5fa57942b5d1509e7afbbd
-DIST openj9-openjdk-jdk11-openj9-0.27.1.tar.gz 108889106 BLAKE2B 32260d462fd1daab077cd72f5bd16ae793309d1efa930dcc5cbb2c56b1fc33194f93a4aaef904b23c9a6d16b0206042fbd3a1bc812005e2d115a3f5564849b6f SHA512 a33d0382c4a13cc608341715214c52ef3a81d8476291c078f6a808ebd0674b5f6153645fbd61ec818298e8e82d962b92107b73be67d3ab2610bbbae06804c28b
-DIST openj9-openjdk-jdk16-openj9-0.27.1.tar.gz 90946973 BLAKE2B 6e06d96e74b8201fbec23eca14329b13f2a828a0abc6b29658a0b84af927f04142d2f9fd7810e93a00ab6d99e8bc71d38c21fc4bc26eb334166d596567b0f51b SHA512 c170ded18e3f1a41b3cc83d8d16202b4debdcd3d2fa4fbca7ce2c78be1d3d3fa8bc0d466b0a280b7c63a1161e3f50ece3b468096876a61e0cdb999d402895e06
+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
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-11.0.27.1.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-11.0.29.0.ebuild
index e7280d3..2dd5df5 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-11.0.27.1.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-11.0.29.0.ebuild
@@ -19,15 +19,15 @@ if [[ ${OPENJ9_PV} == 9999 ]]; then
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
+ https://github.com/eclipse/openj9/archive/${OPENJ9_P}.tar.gz -> ${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"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64"
-IUSE="alsa cups ddr debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap"
+IUSE="alsa cups custom-optimization ddr debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap"
COMMON_DEPEND="
media-libs/freetype:2=
@@ -188,12 +188,15 @@ src_prepare() {
eapply -d omr -- "${FILESDIR}/omr-fam.patch"
if [[ ${OPENJ9_PV} != 9999 ]]; then
- sed -i -e '/^OPENJ9_SHA :=/s/:=.*/:= '${OPENJ9_P}/ \
+ 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
+ closed/OpenJ9.gmk || die
fi
+ find openj9/ omr/ -name CMakeLists.txt -exec grep -l 'set(OMR_WARNINGS_AS_ERRORS ON' {} + | xargs sed -i -e '/set(OMR_WARNINGS_AS_ERRORS ON/s/ON/OFF/' || die
+
chmod +x configure || die
}
@@ -201,6 +204,8 @@ src_configure() {
# 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*'
+
# Enabling full docs appears to break doc building. If not
# explicitly disabled, the flag will get auto-enabled if pandoc and
# graphviz are detected. pandoc has loads of dependencies anyway.
@@ -262,14 +267,21 @@ src_configure() {
}
src_compile() {
+ local mycmakeargsx=(
+ "-DCMAKE_C_FLAGS='${CFLAGS}'"
+ "-DJ9JIT_EXTRA_CFLAGS='${CFLAGS}'"
+ "-DCMAKE_CXX_FLAGS='${CXXFLAGS}'"
+ "-DJ9JIT_EXTRA_CXXFLAGS='${CXXFLAGS}'"
+ "-DCMAKE_EXE_LINKER_FLAGS='${LDFLAGS}'"
+ -DOMR_WARNINGS_AS_ERRORS=OFF
+ )
local myemakeargs=(
JOBS=$(makeopts_jobs)
- # https://github.com/ibmruntimes/openj9-openjdk-jdk14/issues/72
- #LOG=debug
+ LOG=debug
$(usex doc docs '')
$(usex jbootstrap bootcycle-images product-images)
- EXTRA_CMAKE_ARGS="-DOMR_WARNINGS_AS_ERRORS=OFF"
+ EXTRA_CMAKE_ARGS="${mycmakeargsx[*]}"
)
emake "${myemakeargs[@]}" -j1 #nowarn
}
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-16.0.27.1.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-17.0.29.0.ebuild
index 0796047..0c2d6a5 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-16.0.27.1.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-17.0.29.0.ebuild
@@ -27,7 +27,7 @@ fi
LICENSE="GPL-2"
KEYWORDS="~amd64"
-IUSE="alsa cups ddr debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap"
+IUSE="alsa cups custom-optimization ddr debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap"
COMMON_DEPEND="
media-libs/freetype:2=
@@ -80,7 +80,10 @@ DEPEND="
javafx? ( dev-java/openjfx:${SLOT}= )
|| (
virtual/jdk:${SLOT}
- virtual/jdk:$((SLOT-1))
+ dev-java/openj9-openjdk-bin:${SLOT}
+ dev-java/openj9-openjdk:${SLOT}
+ dev-java/openjdk-bin:${SLOT}
+ dev-java/openjdk:${SLOT}
)
"
@@ -116,7 +119,46 @@ pkg_pretend() {
pkg_setup() {
openjdk_check_requirements
java-vm-2_pkg_setup
- java-pkg-2_pkg_setup
+
+ 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
}
src_unpack() {
@@ -150,9 +192,11 @@ src_prepare() {
-e '/^OPENJ9_SHA :=/s/:=.*/:= '${OPENJ9_P}/ \
-e '/^OPENJ9_TAG :=/s/:=.*/:= '${OPENJ9_P}/ \
-e '/^OPENJ9OMR_SHA :=/s/:=.*/:= '${OPENJ9_P}/ \
- closed/OpenJ9.gmk
+ closed/OpenJ9.gmk || die
fi
+ find openj9/ omr/ -name CMakeLists.txt -exec grep -l 'set(OMR_WARNINGS_AS_ERRORS ON' {} + | xargs sed -i -e '/set(OMR_WARNINGS_AS_ERRORS ON/s/ON/OFF/' || die
+
chmod +x configure || die
}
@@ -160,6 +204,8 @@ src_configure() {
# 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*'
+
# Enabling full docs appears to break doc building. If not
# explicitly disabled, the flag will get auto-enabled if pandoc and
# graphviz are detected. pandoc has loads of dependencies anyway.
@@ -221,14 +267,21 @@ src_configure() {
}
src_compile() {
+ local mycmakeargsx=(
+ "-DCMAKE_C_FLAGS='${CFLAGS}'"
+ "-DJ9JIT_EXTRA_CFLAGS='${CFLAGS}'"
+ "-DCMAKE_CXX_FLAGS='${CXXFLAGS}'"
+ "-DJ9JIT_EXTRA_CXXFLAGS='${CXXFLAGS}'"
+ "-DCMAKE_EXE_LINKER_FLAGS='${LDFLAGS}'"
+ -DOMR_WARNINGS_AS_ERRORS=OFF
+ )
local myemakeargs=(
JOBS=$(makeopts_jobs)
- # https://github.com/ibmruntimes/openj9-openjdk-jdk14/issues/72
- #LOG=debug
+ LOG=debug
$(usex doc docs '')
$(usex jbootstrap bootcycle-images product-images)
- EXTRA_CMAKE_ARGS="-DOMR_WARNINGS_AS_ERRORS=OFF"
+ EXTRA_CMAKE_ARGS="${mycmakeargsx[*]}"
)
emake "${myemakeargs[@]}" -j1 #nowarn
}
@@ -285,7 +338,7 @@ 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"
+ 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"
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-21 16:17:31 +0000