/[gentoo-x86]/eclass/java-utils-2.eclass
Gentoo

Diff of /eclass/java-utils-2.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.2 Revision 1.3
1324 if [[ -n ${GENTOO_COMPILER} ]]; then 1324 if [[ -n ${GENTOO_COMPILER} ]]; then
1325 debug-print "GENTOO_COMPILER already set" 1325 debug-print "GENTOO_COMPILER already set"
1326 return 1326 return
1327 fi 1327 fi
1328 1328
1329 local compilers;
1330 if [[ -z ${JAVA_PKG_FORCE_COMPILER} ]]; then
1329 local compilers="$(source ${JAVA_PKG_COMPILERS_CONF} 1>/dev/null 2>&1; echo ${COMPILERS})" 1331 compilers="$(source ${JAVA_PKG_COMPILERS_CONF} 1>/dev/null 2>&1; echo ${COMPILERS})"
1332 else
1333 compilers=${JAVA_PKG_FORCE_COMPILER}
1334 fi
1335
1330 debug-print "Read \"${compilers}\" from ${JAVA_PKG_COMPILERS_CONF}" 1336 debug-print "Read \"${compilers}\" from ${JAVA_PKG_COMPILERS_CONF}"
1331 1337
1332 # Figure out if we should announce what compiler we're using 1338 # Figure out if we should announce what compiler we're using
1333 local compiler 1339 local compiler
1334 for compiler in ${compilers}; do 1340 for compiler in ${compilers}; do
1655 fi 1661 fi
1656 debug-print "Using: $(java-config -f)" 1662 debug-print "Using: $(java-config -f)"
1657 1663
1658 java-pkg_setup-vm 1664 java-pkg_setup-vm
1659 1665
1666 export JAVA=$(java-config -java)
1667 export JAVAC=$(java-config -javac)
1660 export JAVACFLAGS="$(java-pkg_javac-args)" 1668 export JAVACFLAGS="$(java-pkg_javac-args)"
1661 [[ -n ${JAVACFLAGS_EXTRA} ]] && export JAVACFLAGS="${JAVACFLAGS_EXTRA} ${JAVACFLAGS}" 1669 [[ -n ${JAVACFLAGS_EXTRA} ]] && export JAVACFLAGS="${JAVACFLAGS_EXTRA} ${JAVACFLAGS}"
1662 1670
1663 export JAVA_HOME="$(java-config -g JAVA_HOME)" 1671 export JAVA_HOME="$(java-config -g JAVA_HOME)"
1664 export JDK_HOME=${JAVA_HOME} 1672 export JDK_HOME=${JAVA_HOME}

Legend:
Removed from v.1.2  
changed lines
  Added in v.1.3

  ViewVC Help
Powered by ViewVC 1.1.20