committing changes in /etc after emerge run
Package changes:
This commit is contained in:
parent
54166e3f10
commit
df2736187a
@ -1 +0,0 @@
|
|||||||
MANPATH="/etc/java-config-2/current-system-vm/man/"
|
|
@ -1,21 +0,0 @@
|
|||||||
# Copyright 1999-2013 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License, v2 or later
|
|
||||||
|
|
||||||
set gentoo_user_vm = "${HOME}/.gentoo/java-config-2/current-user-vm"
|
|
||||||
set gentoo_system_vm = "/etc/java-config-2/current-system-vm"
|
|
||||||
|
|
||||||
## If we have a current-user-vm (and aren't root)... set it to JAVA_HOME
|
|
||||||
## Otherwise set to the current system vm
|
|
||||||
if ( ( "$uid" != "0" ) && ( -l $gentoo_user_vm ) ) then
|
|
||||||
setenv JAVA_HOME $gentoo_user_vm
|
|
||||||
else if ( -l $gentoo_system_vm ) then
|
|
||||||
setenv JAVA_HOME $gentoo_system_vm
|
|
||||||
endif
|
|
||||||
unset gentoo_user_vm gentoo_system_vm
|
|
||||||
|
|
||||||
if ( $?JAVA_HOME ) then
|
|
||||||
# prepending to come before generation 1
|
|
||||||
setenv MANPATH "${JAVA_HOME}/man:${MANPATH}"
|
|
||||||
setenv JDK_HOME $JAVA_HOME
|
|
||||||
setenv JAVAC ${JDK_HOME}/bin/javac
|
|
||||||
endif
|
|
@ -1,33 +0,0 @@
|
|||||||
# Copyright 1999-2013 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License, v2 or later
|
|
||||||
|
|
||||||
# If we have a current-user-vm (and aren't root)... set it to JAVA_HOME
|
|
||||||
gentoo_user_vm="${HOME}/.gentoo/java-config-2/current-user-vm"
|
|
||||||
gentoo_system_vm="/etc/java-config-2/current-system-vm"
|
|
||||||
|
|
||||||
# Please make sure that this script is POSIX compliant
|
|
||||||
# See https://bugs.gentoo.org/show_bug.cgi?id=169925
|
|
||||||
# for more details"
|
|
||||||
|
|
||||||
if [ -z "${UID}" ] ; then
|
|
||||||
# id lives in /usr/bin which might not be mounted
|
|
||||||
if type id >/dev/null 2>/dev/null ; then
|
|
||||||
user_id=$(id -u)
|
|
||||||
else
|
|
||||||
[ "${USER}" = "root" ] && user_id=0
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# The root user uses the system vm
|
|
||||||
if [ "${user_id}" != 0 -a -L "${gentoo_user_vm}" ]; then
|
|
||||||
export JAVA_HOME=${gentoo_user_vm}
|
|
||||||
# Otherwise set to the current system vm
|
|
||||||
elif [ -L "/etc/java-config-2/current-system-vm" ]; then
|
|
||||||
export JAVA_HOME=${gentoo_system_vm}
|
|
||||||
fi
|
|
||||||
|
|
||||||
# prepending to come before generation 1
|
|
||||||
export MANPATH="${JAVA_HOME}/man:${MANPATH}"
|
|
||||||
export JDK_HOME=${JAVA_HOME}
|
|
||||||
export JAVAC=${JDK_HOME}/bin/javac
|
|
||||||
unset gentoo_user_vm gentoo_system_vm user_id
|
|
@ -1,9 +0,0 @@
|
|||||||
# The VM dynamically loads these at runtime so they will end up as missing
|
|
||||||
# but actually work just fine. See for example
|
|
||||||
# https://bugs.gentoo.org/show_bug.cgi?id=152039
|
|
||||||
#
|
|
||||||
# This file should only have files the are used by things like swt. If there
|
|
||||||
# are "broken" links inside the jre itself, the jre should install it's own
|
|
||||||
# control file.
|
|
||||||
|
|
||||||
LD_LIBRARY_MASK="libjvm.so libjawt.so"
|
|
Loading…
Reference in New Issue
Block a user