/hg/icedtea6: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Dec 18 07:23:12 PST 2013
changeset 7fe7d93cc7e1 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=7fe7d93cc7e1
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Dec 18 15:21:01 2013 +0000
PR1361: 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>
PR1360: Check for /usr/lib64 JVMs and generic JPackage alternative
* INSTALL: Add /etc/alternatives/java_sdk_openjdk.
* acinclude.m4: Likewise.
changeset a81a87c1a918 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a81a87c1a918
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Dec 18 15:22:58 2013 +0000
PR1627: JDK check should depend on bootstrapping check
2013-12-18 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1627: JDK check should depend on bootstrapping check
* acinclude.m4:
(IT_CHECK_IF_BOOTSTRAPPING): Define only once.
(IT_CHECK_FOR_JDK): Define only once and require
IT_CHECK_IF_BOOTSTRAPPING for setting of
enable_bootstrap variable.
* configure.ac: Don't invoke IT_CHECK_IF_BOOTSTRAPPING
explicitly.
* NEWS: Updated.
diffstat:
ChangeLog | 28 ++++++++++++++++++++++++++++
INSTALL | 19 +++++++++----------
NEWS | 2 ++
acinclude.m4 | 26 ++++++++++++++++++--------
configure.ac | 1 -
5 files changed, 57 insertions(+), 19 deletions(-)
diffs (162 lines):
diff -r be0e350adea7 -r a81a87c1a918 ChangeLog
--- a/ChangeLog Wed Dec 18 14:01:07 2013 +0000
+++ b/ChangeLog Wed Dec 18 15:22:58 2013 +0000
@@ -1,3 +1,31 @@
+2013-12-18 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1627: JDK check should depend on bootstrapping check
+ * acinclude.m4:
+ (IT_CHECK_IF_BOOTSTRAPPING): Define only once.
+ (IT_CHECK_FOR_JDK): Define only once and require
+ IT_CHECK_IF_BOOTSTRAPPING for setting of
+ enable_bootstrap variable.
+ * configure.ac: Don't invoke IT_CHECK_IF_BOOTSTRAPPING
+ explicitly.
+ * NEWS: Updated.
+
+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>
+
+ PR1360: 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>
* Makefile.am:
diff -r be0e350adea7 -r a81a87c1a918 INSTALL
--- a/INSTALL Wed Dec 18 14:01:07 2013 +0000
+++ b/INSTALL Wed Dec 18 15:22:58 2013 +0000
@@ -44,26 +44,25 @@
./configure
make
-The following locations are checked for a JDK:
+The following locations are checked for a JDK on all builds:
* /usr/lib/jvm/java-gcj
* /usr/lib/jvm/gcj-jdk
* /usr/lib/jvm/cacao
- * /usr/lib/jvm/java-openjdk
+ * /usr/lib/jvm/icedtea-6
* /usr/lib/jvm/icedtea6
* /usr/lib/jvm/java-6-openjdk
+ * /usr/lib/jvm/java-1.6.0-openjdk.x86_64
+ * /usr/lib64/jvm/java-1.6.0-openjdk
+ * /usr/lib/jvm/java-1.6.0
+ * /usr/lib/jvm/java-openjdk
* /usr/lib/jvm/openjdk
* /usr/lib/jvm/java-icedtea
+ * /etc/alternatives/java_sdk_openjdk
in that order.
A quick build can be performed by passing --disable-bootstrap.
-This requires a recent version of IcedTea6 as the boot JDK.
-The following locations are checked for IcedTea6:
- * /usr/lib/jvm/java-openjdk
- * /usr/lib/jvm/icedtea6
- * /usr/lib/jvm/java-6-openjdk
- * /usr/lib/jvm/openjdk
- * /usr/lib/jvm/java-icedtea
-
+This requires a recent version of IcedTea6 as the boot JDK, so
+the first three JDKs above are not searched for.
Note that IcedTea7 can not be used to build IcedTea6.
diff -r be0e350adea7 -r a81a87c1a918 NEWS
--- a/NEWS Wed Dec 18 14:01:07 2013 +0000
+++ b/NEWS Wed Dec 18 15:22:58 2013 +0000
@@ -17,6 +17,7 @@
- PR1458: Make use of bootstrap tools & -Xbootclasspath patches optional
- PR718: Backport LCMS2 support from IcedTea7
- PR1288: Allow JARs to be optionally compressed by setting COMPRESS_JARS
+ - PR1361: Check for /usr/lib64 JVMs and generic JPackage alternative
* Import of OpenJDK6 b28
- OJ1: Confirm that community members can commit to hotspot in OpenJDK6
- OJ2: Revert unnecessary file added to hotspot repo
@@ -879,6 +880,7 @@
- RH991170: java does not use correct kerberos credential cache
- PR1535: Allow use of system Kerberos to obtain cache location
- PR1290: Ensure unlimited crypto policy is in place.
+ - PR1627: JDK check should depend on bootstrapping check
* JamVM
- JSR 335: Lambda Expressions
- JEP 171: Implement fence methods in sun.misc.Unsafe
diff -r be0e350adea7 -r a81a87c1a918 acinclude.m4
--- a/acinclude.m4 Wed Dec 18 14:01:07 2013 +0000
+++ b/acinclude.m4 Wed Dec 18 15:22:58 2013 +0000
@@ -1039,7 +1039,7 @@
AM_CONDITIONAL(WITH_HGREV, test "x${HGREV}" != "x")
])
-AC_DEFUN([IT_CHECK_IF_BOOTSTRAPPING],
+AC_DEFUN_ONCE([IT_CHECK_IF_BOOTSTRAPPING],
[
AC_MSG_CHECKING([whether to build a bootstrap version first])
AC_ARG_ENABLE([bootstrap],
@@ -1061,8 +1061,9 @@
AM_CONDITIONAL([BOOTSTRAPPING], test x"${enable_bootstrap}" = "xyes")
])
-AC_DEFUN([IT_CHECK_FOR_JDK],
+AC_DEFUN_ONCE([IT_CHECK_FOR_JDK],
[
+ AC_REQUIRE([IT_CHECK_IF_BOOTSTRAPPING])
AC_MSG_CHECKING([for a JDK home directory])
AC_ARG_WITH([jdk-home],
[AS_HELP_STRING([--with-jdk-home],
@@ -1083,19 +1084,28 @@
SYSTEM_JDK_DIR=
])
if test -z "${SYSTEM_JDK_DIR}"; then
+ AC_MSG_RESULT([not specified])
if test "x${enable_bootstrap}" = "xyes"; then
BOOTSTRAP_VMS="/usr/lib/jvm/java-gcj /usr/lib/jvm/gcj-jdk /usr/lib/jvm/cacao";
fi
- for dir in ${BOOTSTRAP_VMS} /usr/lib/jvm/java-1.6.0 \
- /usr/lib/jvm/icedtea6 /usr/lib/jvm/java-6-openjdk \
- /usr/lib/jvm/java-1.6.0-openjdk /usr/lib/jvm/icedtea-6 ; do
+ ICEDTEA6_VMS="/usr/lib/jvm/icedtea-6 /usr/lib/jvm/icedtea6 /usr/lib/jvm/java-6-openjdk
+ /usr/lib/jvm/java-1.6.0-openjdk.x86_64 /usr/lib64/jvm/java-1.6.0-openjdk
+ /usr/lib/jvm/java-1.6.0"
+ for dir in ${BOOTSTRAP_VMS} ${ICEDTEA6_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
diff -r be0e350adea7 -r a81a87c1a918 configure.ac
--- a/configure.ac Wed Dec 18 14:01:07 2013 +0000
+++ b/configure.ac Wed Dec 18 15:22:58 2013 +0000
@@ -251,7 +251,6 @@
OPENJDK_BUILD_DIR=openjdk.build
AC_SUBST(OPENJDK_BUILD_DIR)
-IT_CHECK_IF_BOOTSTRAPPING
IT_CHECK_IF_DOWNLOADING
IT_FIND_JAVA
IT_FIND_COMPILER
More information about the distro-pkg-dev
mailing list