dev-java/openj9-openjdk: fixes

3 files changed, 8 insertions, 2 deletions

diff --git a/dev-java/openj9-openjdk/metadata.xml b/dev-java/openj9-openjdk/metadata.xml
index 2c13f5e..90c4084 100644
--- a/dev-java/openj9-openjdk/metadata.xml
+++ b/dev-java/openj9-openjdk/metadata.xml
@@ -15,6 +15,7 @@
 		<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="large-heap">Support Java heap sizes greater than 57Gb</flag>
 		<flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
 		<flag name="webstart">Provide javaws command through symlink to icedtea-web</flag>
 	</use>
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-11.0.21.0.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-11.0.21.0.ebuild
index 027a1a6..66beadb 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-11.0.21.0.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-11.0.21.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 LICENSE="GPL-2"
 KEYWORDS="~amd64"
 
-IUSE="alsa custom-cflags custom-optimization cups ddr debug doc examples gentoo-vm headless-awt javafx +jbootstrap nsplugin +pch selinux source systemtap webstart"
+IUSE="alsa custom-cflags custom-optimization cups ddr debug doc examples gentoo-vm headless-awt javafx +jbootstrap large-heap nsplugin +pch selinux source systemtap webstart"
 
 COMMON_DEPEND="
 	media-libs/freetype:2=
@@ -152,6 +152,7 @@ src_prepare() {
 	ln -s ../openj9-${OPENJ9_P} openj9 || die
 	ln -s ../openj9-omr-${OPENJ9_P} omr || die
 	default
+	eapply "${FILESDIR}/openjdk-8238380-childproc-fcommon.patch"
 	(
 		cd openj9 || die
 		#eapply "${FILESDIR}/openj9-j9utf8-fam.patch"
@@ -212,6 +213,7 @@ 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)
@@ -219,6 +221,7 @@ src_configure() {
 		--with-freemarker-jar=$(java-pkg_getjar --build-only $freemarker freemarker.jar)
 		--disable-warnings-as-errors{,-omr,-openj9}
 		$(use_enable ddr)
+		$(use_with large-heap noncompressedrefs)
 	)
 
 	if use javafx; then
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-14.0.21.0.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-14.0.21.0.ebuild
index 027a1a6..51ba26f 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-14.0.21.0.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-14.0.21.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 LICENSE="GPL-2"
 KEYWORDS="~amd64"
 
-IUSE="alsa custom-cflags custom-optimization cups ddr debug doc examples gentoo-vm headless-awt javafx +jbootstrap nsplugin +pch selinux source systemtap webstart"
+IUSE="alsa custom-cflags custom-optimization cups ddr debug doc examples gentoo-vm headless-awt javafx +jbootstrap large-heap nsplugin +pch selinux source systemtap webstart"
 
 COMMON_DEPEND="
 	media-libs/freetype:2=
@@ -212,6 +212,7 @@ 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)
@@ -219,6 +220,7 @@ src_configure() {
 		--with-freemarker-jar=$(java-pkg_getjar --build-only $freemarker freemarker.jar)
 		--disable-warnings-as-errors{,-omr,-openj9}
 		$(use_enable ddr)
+		$(use_with large-heap noncompressedrefs)
 	)
 
 	if use javafx; then