From 7c302914f5b566df48488e3959552feae1c1cab1 Mon Sep 17 00:00:00 2001 From: "Alex Xu (Hello71)" Date: Sat, 15 Aug 2020 09:43:10 -0400 Subject: dev-java/openj9-openjdk: add 9999, various fixes --- .../openj9-openjdk/files/openj9-j9utf8-fam.patch | 26 ---------------------- .../openj9-openjdk/files/openj9-openjdk-11.env.sh | 16 ------------- .../openj9-openjdk/files/openj9-openjdk-14.env.sh | 16 ------------- .../openj9-openjdk/files/openj9-openjdk.env.sh | 16 +++++++++++++ 4 files changed, 16 insertions(+), 58 deletions(-) delete mode 100644 dev-java/openj9-openjdk/files/openj9-j9utf8-fam.patch delete mode 100644 dev-java/openj9-openjdk/files/openj9-openjdk-11.env.sh delete mode 100644 dev-java/openj9-openjdk/files/openj9-openjdk-14.env.sh create mode 100644 dev-java/openj9-openjdk/files/openj9-openjdk.env.sh (limited to 'dev-java/openj9-openjdk/files') diff --git a/dev-java/openj9-openjdk/files/openj9-j9utf8-fam.patch b/dev-java/openj9-openjdk/files/openj9-j9utf8-fam.patch deleted file mode 100644 index f45a539..0000000 --- a/dev-java/openj9-openjdk/files/openj9-j9utf8-fam.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/runtime/cfdumper/romdump.c b/runtime/cfdumper/romdump.c -index 5040c2c25..1cfcd36c7 100644 ---- a/runtime/cfdumper/romdump.c -+++ b/runtime/cfdumper/romdump.c -@@ -154,7 +154,7 @@ addRegion(J9Pool *regionPool, UDATA offset, UDATA length, UDATA type, const char - static UDATA - getUTF8Length(J9UTF8 *utf8) - { -- UDATA length = sizeof(J9UTF8) + J9UTF8_LENGTH(utf8) - sizeof(J9UTF8_DATA(utf8)); -+ UDATA length = sizeof(J9UTF8) + J9UTF8_LENGTH(utf8); - if (length & 1) { - length++; - } -diff --git a/runtime/oti/j9nonbuilder.h b/runtime/oti/j9nonbuilder.h -index c5705188d..e9babe227 100644 ---- a/runtime/oti/j9nonbuilder.h -+++ b/runtime/oti/j9nonbuilder.h -@@ -3219,7 +3219,7 @@ typedef struct J9ClassLoader { - - typedef struct J9UTF8 { - U_16 length; -- U_8 data[2]; -+ U_8 data[]; - } J9UTF8; - - typedef struct J9ROMClass { diff --git a/dev-java/openj9-openjdk/files/openj9-openjdk-11.env.sh b/dev-java/openj9-openjdk/files/openj9-openjdk-11.env.sh deleted file mode 100644 index 5aac9c7..0000000 --- a/dev-java/openj9-openjdk/files/openj9-openjdk-11.env.sh +++ /dev/null @@ -1,16 +0,0 @@ -# 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}" -JAVAC="\${JAVA_HOME}/bin/javac" -PATH="\${JAVA_HOME}/bin" -ROOTPATH="\${JAVA_HOME}/bin" -LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/" -MANPATH="" -PROVIDES_TYPE="JDK JRE" -PROVIDES_VERSION="${SLOT}" -BOOTCLASSPATH="" -GENERATION="2" -ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" diff --git a/dev-java/openj9-openjdk/files/openj9-openjdk-14.env.sh b/dev-java/openj9-openjdk/files/openj9-openjdk-14.env.sh deleted file mode 100644 index 5aac9c7..0000000 --- a/dev-java/openj9-openjdk/files/openj9-openjdk-14.env.sh +++ /dev/null @@ -1,16 +0,0 @@ -# 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}" -JAVAC="\${JAVA_HOME}/bin/javac" -PATH="\${JAVA_HOME}/bin" -ROOTPATH="\${JAVA_HOME}/bin" -LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/" -MANPATH="" -PROVIDES_TYPE="JDK JRE" -PROVIDES_VERSION="${SLOT}" -BOOTCLASSPATH="" -GENERATION="2" -ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" diff --git a/dev-java/openj9-openjdk/files/openj9-openjdk.env.sh b/dev-java/openj9-openjdk/files/openj9-openjdk.env.sh new file mode 100644 index 0000000..5aac9c7 --- /dev/null +++ b/dev-java/openj9-openjdk/files/openj9-openjdk.env.sh @@ -0,0 +1,16 @@ +# 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}" +JAVAC="\${JAVA_HOME}/bin/javac" +PATH="\${JAVA_HOME}/bin" +ROOTPATH="\${JAVA_HOME}/bin" +LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/" +MANPATH="" +PROVIDES_TYPE="JDK JRE" +PROVIDES_VERSION="${SLOT}" +BOOTCLASSPATH="" +GENERATION="2" +ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" -- cgit v1.2.3-70-g09d2