diff options
Diffstat (limited to 'dev-java/openj9-openjdk-bin')
| -rw-r--r-- | dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin-16.env.sh | 16 | ||||
| -rw-r--r-- | dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin.env.sh (renamed from dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin-11.env.sh) | 0 | ||||
| -rw-r--r-- | dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.11.9.0.26.0.ebuild | 2 | ||||
| -rw-r--r-- | dev-java/openj9-openjdk-bin/openj9-openjdk-bin-16.0.1.9.0.26.0.ebuild | 7 |
4 files changed, 2 insertions, 23 deletions
diff --git a/dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin-16.env.sh b/dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin-16.env.sh deleted file mode 100644 index 2e200d9..0000000 --- a/dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin-16.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="AdoptOpenJDK ${DL_PV}" -JAVA_HOME="${EPREFIX}/opt/${P}" -JDK_HOME="${EPREFIX}/opt/${P}" -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-bin/files/openj9-openjdk-bin-11.env.sh b/dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin.env.sh index 2e200d9..2e200d9 100644 --- a/dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin-11.env.sh +++ b/dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin.env.sh diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.11.9.0.26.0.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.11.9.0.26.0.ebuild index bd6296d..a1ef619 100644 --- a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.11.9.0.26.0.ebuild +++ b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.11.9.0.26.0.ebuild @@ -98,7 +98,7 @@ src_install() { # provide stable symlink dosym "${P}" "/opt/${PN}-${SLOT}" - use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh + 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 diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-16.0.1.9.0.26.0.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-16.0.1.9.0.26.0.ebuild index b75020d..d5df217 100644 --- a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-16.0.1.9.0.26.0.ebuild +++ b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-16.0.1.9.0.26.0.ebuild @@ -69,11 +69,6 @@ src_install() { local dest="/opt/${P}" 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. - do_rm 'lib/libfreetype.*' - # Oracle and IcedTea have libjsoundalsa.so depending on # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. if ! use alsa ; then @@ -98,7 +93,7 @@ src_install() { # provide stable symlink dosym "${P}" "/opt/${PN}-${SLOT}" - use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh + 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 |