/hg/icedtea: PR1359: Check for /usr/lib64 JVMs and generic JPack...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Apr 18 16:47:13 UTC 2014
changeset 87d03fbc8737 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=87d03fbc8737
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Apr 18 17:42:12 2014 +0100
PR1359: Check for /usr/lib64 JVMs and generic JPackage alternative
2013-06-06 Andrew John Hughes <gnu.andrew at member.fsf.org>
* INSTALL:
Synchronise list of VMs with macro in acinclude.m4.
* acinclude.m4: Provide separate output for user
specified JDKs and the checking process. Extend
the list of JVMs to include more from Fedora &
RHEL and the newer Gentoo variants.
* NEWS: Updated.
2013-03-21 Michal Vyskocil <mvyskocil at suse.cz>
PR1359: Check for /usr/lib64 JVMs and generic JPackage alternative
* INSTALL: Add /etc/alternatives/java_sdk_openjdk.
* acinclude.m4: Likewise.
2013-06-06 Andrew John Hughes <gnu.andrew at member.fsf.org>
* AUTHORS: Updated with Michal.
diffstat:
AUTHORS | 1 +
ChangeLog | 20 ++++++++++++++++++++
INSTALL | 31 +++++++++++++++++++------------
NEWS | 1 +
acinclude.m4 | 25 ++++++++++++++++++-------
5 files changed, 59 insertions(+), 19 deletions(-)
diffs (143 lines):
diff -r 4acb21372190 -r 87d03fbc8737 AUTHORS
--- a/AUTHORS Tue Apr 01 01:58:21 2014 +0100
+++ b/AUTHORS Fri Apr 18 17:42:12 2014 +0100
@@ -35,6 +35,7 @@
Christian Thalinger <twisti at complang.tuwien.ac.at>
Dalibor Topic <robilad at kaffe.org>
Arnaud Vandyck <avdyk at debian.org>
+Michal Vyskocil <mvyskocil at suse.cz>
Mark Wielaard <mjw at klomp.org>
Yi Zhan <yi.zhan at intel.com>
diff -r 4acb21372190 -r 87d03fbc8737 ChangeLog
--- a/ChangeLog Tue Apr 01 01:58:21 2014 +0100
+++ b/ChangeLog Fri Apr 18 17:42:12 2014 +0100
@@ -1,3 +1,23 @@
+2013-06-06 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * INSTALL:
+ Synchronise list of VMs with macro in acinclude.m4.
+ * acinclude.m4: Provide separate output for user
+ specified JDKs and the checking process. Extend
+ the list of JVMs to include more from Fedora &
+ RHEL and the newer Gentoo variants.
+ * NEWS: Updated.
+
+2013-03-21 Michal Vyskocil <mvyskocil at suse.cz>
+
+ PR1359: Check for /usr/lib64 JVMs and generic JPackage alternative
+ * INSTALL: Add /etc/alternatives/java_sdk_openjdk.
+ * acinclude.m4: Likewise.
+
+2013-06-06 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * AUTHORS: Updated with Michal.
+
2013-04-24 Andrew John Hughes <gnu.andrew at member.fsf.org>
* patches/cacao/jsig.patch:
diff -r 4acb21372190 -r 87d03fbc8737 INSTALL
--- a/INSTALL Tue Apr 01 01:58:21 2014 +0100
+++ b/INSTALL Fri Apr 18 17:42:12 2014 +0100
@@ -7,10 +7,7 @@
The build requirements are as follows:
-A bootstrap JDK, either:
- - GNU libgcj 4.4.0 (or equivalent class library based on GNU Classpath >= 0.95) for --enable-bootstrap mode (the default)
- - IcedTea6 or IcedTea7 for --disable-bootstrap mode
-Eclipse Java Compiler (ecj)
+A bootstrap JDK, either IcedTea7 or IcedTea8
CUPS
libX11 (libXp, libXtst, libXi, libXt)
Freetype2
@@ -49,17 +46,27 @@
make
The following locations are checked for a JDK:
+ * /usr/lib/jvm/icedtea-8
+ * /usr/lib/jvm/java-1.8.0-openjdk
+ * /usr/lib/jvm/java-1.8.0-openjdk.x86_64
+ * /usr/lib64/jvm/java-1.8.0-openjdk
+ * /usr/lib/jvm/java-1.8.0
+ * /usr/lib/jvm/icedtea-7
+ * /usr/lib/jvm/icedtea7
+ * /usr/lib/jvm/java-1.7.0-openjdk
+ * /usr/lib/jvm/java-1.7.0-openjdk.x86_64
+ * /usr/lib64/jvm/java-1.7.0-openjdk
+ * /usr/lib/jvm/java-1.7.0
+in the order given above.
+
+If bootstrapping is enabled, the following JDK locations are appended to the above list:
+ * /usr/lib/jvm/cacao
+
+Finally, the following generic locations are checked as a last resort:
* /usr/lib/jvm/java-openjdk
- * /usr/lib/jvm/icedtea6
- * /usr/lib/jvm/java-6-openjdk
* /usr/lib/jvm/openjdk
* /usr/lib/jvm/java-icedtea
-in the order given above.
-
-If bootstrapping is enabled, the following JDK locations are prepended to the above list:
- * /usr/lib/jvm/java-gcj
- * /usr/lib/jvm/gcj-jdk
- * /usr/lib/jvm/cacao
+ * /etc/alternatives/java_sdk_openjdk
There is currently no install target. IcedTea ends up in
openjdk.build when the build completes.
diff -r 4acb21372190 -r 87d03fbc8737 NEWS
--- a/NEWS Tue Apr 01 01:58:21 2014 +0100
+++ b/NEWS Fri Apr 18 17:42:12 2014 +0100
@@ -45,6 +45,7 @@
- PR1357: Make XRender mandatory
- PR1325: Only add classes to rt-source-files.txt if the class (or one or more of its methods/fields)
are actually missing from the boot JDK
+ - PR1359: Check for /usr/lib64 JVMs and generic JPackage alternative
New in release 2.0 (2011-XX-XX):
diff -r 4acb21372190 -r 87d03fbc8737 acinclude.m4
--- a/acinclude.m4 Tue Apr 01 01:58:21 2014 +0100
+++ b/acinclude.m4 Fri Apr 18 17:42:12 2014 +0100
@@ -1137,21 +1137,32 @@
SYSTEM_JDK_DIR=
])
if test -z "${SYSTEM_JDK_DIR}"; then
+ AC_MSG_RESULT([not specified])
if test "x${enable_bootstrap}" = "xyes"; then
GCJ_VMS="/usr/lib/jvm/java-gcj /usr/lib/jvm/gcj-jdk";
BOOTSTRAP_VMS="/usr/lib/jvm/cacao";
fi
- ICEDTEA7_VMS="/usr/lib/jvm/icedtea7 /usr/lib/jvm/java-1.7.0-openjdk"
- ICEDTEA8_VMS="/usr/lib/jvm/icedtea8 /usr/lib/jvm/java-1.8.0-openjdk"
- for dir in ${BOOTSTRAP_VMS} ${ICEDTEA8_VMS} ${ICEDTEA7_VMS} \
- /usr/lib/jvm/java-openjdk /usr/lib/jvm/openjdk /usr/lib/jvm/java-icedtea ; do
+ ICEDTEA7_VMS="/usr/lib/jvm/icedtea-7 /usr/lib/jvm/icedtea7 /usr/lib/jvm/java-1.7.0-openjdk
+ /usr/lib/jvm/java-1.7.0-openjdk.x86_64 /usr/lib64/jvm/java-1.7.0-openjdk
+ /usr/lib/jvm/java-1.7.0"
+ ICEDTEA8_VMS="/usr/lib/jvm/icedtea-8 /usr/lib/jvm/java-1.8.0-openjdk
+ /usr/lib/jvm/java-1.8.0-openjdk.x86_64 /usr/lib64/jvm/java-1.8.0-openjdk
+ /usr/lib/jvm/java-1.8.0"
+ for dir in ${ICEDTEA8_VMS} ${ICEDTEA7_VMS} ${BOOTSTRAP_VMS} \
+ /usr/lib/jvm/java-openjdk /usr/lib/jvm/openjdk /usr/lib/jvm/java-icedtea \
+ /etc/alternatives/java_sdk_openjdk ; do
+ AC_MSG_CHECKING([for ${dir}]);
if test -d $dir; then
- SYSTEM_JDK_DIR=$dir
- break
+ SYSTEM_JDK_DIR=$dir ;
+ AC_MSG_RESULT([found]) ;
+ break ;
+ else
+ AC_MSG_RESULT([not found]) ;
fi
done
+ else
+ AC_MSG_RESULT(${SYSTEM_JDK_DIR})
fi
- AC_MSG_RESULT(${SYSTEM_JDK_DIR})
if ! test -d "${SYSTEM_JDK_DIR}"; then
AC_MSG_ERROR("A JDK home directory could not be found.")
fi
More information about the distro-pkg-dev
mailing list