/hg/icedtea: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu May 14 02:43:44 UTC 2015
changeset a5c3681e3d67 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=a5c3681e3d67
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu May 14 02:36:17 2015 +0100
PR2349: ?struct jvm_version_info? has no member named ?is_kernel_jvm?
2015-05-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2349: ?struct jvm_version_info? has
no member named ?is_kernel_jvm?
* Makefile.am:
(ICEDTEA_PATCHES): Add new CACAO
patch.
(cacao): Set runtime library argument
to 'openjdk8'.
* NEWS: Updated.
* patches/cacao/pr2349.patch:
Add support for 'openjdk8' runtime library
argument and don't attempt to set
is_kernel_jvm in this mode.
changeset 9f4be0a502ce in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9f4be0a502ce
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu May 14 03:34:34 2015 +0100
PR2354: stamps/cacao.stamp tries to touch a file in a directory which doesn't exist
2015-05-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2354: stamps/cacao.stamp tries to touch a file
in a directory which doesn't exist
* Makefile.am:
(cacao): Remove reference to hotspot directory
which doesn't exist.
* NEWS: Updated.
changeset 82ddf394f5d9 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=82ddf394f5d9
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu May 14 03:43:26 2015 +0100
PR2355: CACAO build fails to use JRE layout
2015-05-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2355: CACAO build fails to use JRE layout
* NEWS: Updated.
* patches/cacao/pr2349.patch:
Update to initialise WITH_JAVA_RUNTIME_LIBRARY_OPENJDK
automake conditional correctly.
diffstat:
ChangeLog | 32 +++++++++++++++++
Makefile.am | 7 ++-
NEWS | 5 ++-
patches/cacao/pr2349.patch | 85 ++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 125 insertions(+), 4 deletions(-)
diffs (174 lines):
diff -r 1363365ca66b -r 82ddf394f5d9 ChangeLog
--- a/ChangeLog Wed May 13 03:29:48 2015 +0100
+++ b/ChangeLog Thu May 14 03:43:26 2015 +0100
@@ -1,3 +1,35 @@
+2015-05-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2355: CACAO build fails to use JRE layout
+ * NEWS: Updated.
+ * patches/cacao/pr2349.patch:
+ Update to initialise WITH_JAVA_RUNTIME_LIBRARY_OPENJDK
+ automake conditional correctly.
+
+2015-05-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2354: stamps/cacao.stamp tries to touch a file
+ in a directory which doesn't exist
+ * Makefile.am:
+ (cacao): Remove reference to hotspot directory
+ which doesn't exist.
+ * NEWS: Updated.
+
+2015-05-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2349: ‘struct jvm_version_info’ has
+ no member named ‘is_kernel_jvm’
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new CACAO
+ patch.
+ (cacao): Set runtime library argument
+ to 'openjdk8'.
+ * NEWS: Updated.
+ * patches/cacao/pr2349.patch:
+ Add support for 'openjdk8' runtime library
+ argument and don't attempt to set
+ is_kernel_jvm in this mode.
+
2015-05-12 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2350: Update to latest CACAO
diff -r 1363365ca66b -r 82ddf394f5d9 Makefile.am
--- a/Makefile.am Wed May 13 03:29:48 2015 +0100
+++ b/Makefile.am Thu May 14 03:43:26 2015 +0100
@@ -221,7 +221,8 @@
if BUILD_CACAO
ICEDTEA_PATCHES += \
patches/cacao/launcher.patch \
- patches/cacao/pr2032.patch
+ patches/cacao/pr2032.patch \
+ patches/cacao/pr2349.patch
else
if USING_CACAO
ICEDTEA_PATCHES +=
@@ -1902,14 +1903,14 @@
--build=$(build_alias) \
--target=$(target_alias) \
--prefix=$(abs_top_builddir)/cacao/install \
- --with-java-runtime-library=openjdk7 \
+ --with-java-runtime-library=openjdk8 \
--with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \
--with-java-runtime-library-classes=$(RUNTIME) \
--with-libatomic-ops=no \
--enable-jre-layout $(CACAO_CONFIGURE_ARGS); \
$(ARCH_PREFIX) $(MAKE) -j$(PARALLEL_JOBS) install
mkdir -p $(abs_top_builddir)/cacao/install/lib
- touch $(abs_top_builddir)/cacao/install/hotspot/lib/sa-jdi.jar
+ touch $(abs_top_builddir)/cacao/install/lib/sa-jdi.jar
ln -sf server $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/client
touch $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt
ln -sf client/libjvm.so $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/libjsig.so
diff -r 1363365ca66b -r 82ddf394f5d9 NEWS
--- a/NEWS Wed May 13 03:29:48 2015 +0100
+++ b/NEWS Thu May 14 03:43:26 2015 +0100
@@ -100,8 +100,11 @@
- PR2331: IcedTea8 fails to build with IcedTea7 CACAO due to low max heap size
- PR2335: CACAO lacks JVM_FindClassFromCaller
- PR2347: Fix CACAO patches to apply again
+ - PR2349: ‘struct jvm_version_info’ has no member named ‘is_kernel_jvm’
- PR2350: Update to latest CACAO
-
+ - PR2354: stamps/cacao.stamp tries to touch a file in a directory which doesn't exist
+ - PR2355: CACAO build fails to use JRE layout
+
New in release 2.0 (2011-XX-XX):
* JamVM
diff -r 1363365ca66b -r 82ddf394f5d9 patches/cacao/pr2349.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/cacao/pr2349.patch Thu May 14 03:43:26 2015 +0100
@@ -0,0 +1,85 @@
+diff -r c182f119eaad configure.ac
+--- cacao/cacao/configure.ac Fri Dec 12 22:14:45 2014 +0100
++++ cacao/cacao/configure.ac Thu May 14 03:34:48 2015 +0100
+@@ -678,7 +678,7 @@
+ AC_CHECK_WITH_HPI_H
+ AC_CHECK_WITH_JMM_H
+ ;;
+- openjdk7)
++ openjdk7 | openjdk8 )
+ AC_CHECK_WITH_JVM_MD_H
+ AC_CHECK_WITH_JVM_H
+ AC_CHECK_WITH_JMM_H
+@@ -693,7 +693,7 @@
+ cldc1.1 | gnuclasspath)
+ AC_PROG_JAVAC
+ ;;
+- openjdk | openjdk7)
++ openjdk | openjdk7 | openjdk8 )
+ ;;
+ *)
+ AC_MSG_ERROR(unknown classpath configuration ${WITH_JAVA_RUNTIME_LIBRARY})
+diff -r c182f119eaad m4/disable-test-dependency-checks.m4
+--- cacao/cacao/m4/disable-test-dependency-checks.m4 Fri Dec 12 22:14:45 2014 +0100
++++ cacao/cacao/m4/disable-test-dependency-checks.m4 Thu May 14 03:34:48 2015 +0100
+@@ -35,7 +35,7 @@
+ cldc1.1 | gnuclasspath)
+ disable_test_dependency_checks=no
+ ;;
+- openjdk | openjdk7)
++ openjdk | openjdk7 | openjdk8 )
+ disable_test_dependency_checks=yes
+ ;;
+ *)
+diff -r c182f119eaad m4/java-runtime-library.m4
+--- cacao/cacao/m4/java-runtime-library.m4 Fri Dec 12 22:14:45 2014 +0100
++++ cacao/cacao/m4/java-runtime-library.m4 Thu May 14 03:34:48 2015 +0100
+@@ -26,7 +26,7 @@
+ AC_DEFUN([AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY],[
+ AC_MSG_CHECKING(which Java runtime library to use)
+ AC_ARG_WITH([java-runtime-library],
+- [AS_HELP_STRING(--with-java-runtime-library=<type>,specifies which type of classpath to use as Java runtime library (cldc1.1,gnuclasspath,openjdk,openjdk7) [[default=gnuclasspath]])],
++ [AS_HELP_STRING(--with-java-runtime-library=<type>,specifies which type of classpath to use as Java runtime library (cldc1.1,gnuclasspath,openjdk,openjdk7,openjdk8) [[default=gnuclasspath]])],
+ [case "${withval}" in
+ cldc1.1)
+ WITH_JAVA_RUNTIME_LIBRARY=cldc1.1
+@@ -38,6 +38,15 @@
+ AC_DEFINE([WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH], 1, [use GNU Classpath])
+ AC_SUBST(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
+ ;;
++ openjdk8)
++ WITH_JAVA_RUNTIME_LIBRARY=openjdk8
++ AC_DEFINE([WITH_JAVA_RUNTIME_LIBRARY_OPENJDK], 1, [use OpenJDK's Java SE classes])
++ AC_DEFINE([WITH_JAVA_RUNTIME_LIBRARY_OPENJDK_7], 1, [use OpenJDK's version 7])
++ AC_DEFINE([WITH_JAVA_RUNTIME_LIBRARY_OPENJDK_8], 1, [use OpenJDK's version 8])
++ AC_SUBST(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
++ AC_SUBST(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK_7)
++ AC_SUBST(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK_8)
++ ;;
+ openjdk7)
+ WITH_JAVA_RUNTIME_LIBRARY=openjdk7
+ AC_DEFINE([WITH_JAVA_RUNTIME_LIBRARY_OPENJDK], 1, [use OpenJDK's Java SE classes])
+@@ -60,8 +69,9 @@
+ AC_MSG_RESULT(${WITH_JAVA_RUNTIME_LIBRARY})
+ AM_CONDITIONAL([WITH_JAVA_RUNTIME_LIBRARY_CLDC1_1], test x"${WITH_JAVA_RUNTIME_LIBRARY}" = "xcldc1.1")
+ AM_CONDITIONAL([WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH], test x"${WITH_JAVA_RUNTIME_LIBRARY}" = "xgnuclasspath")
+-AM_CONDITIONAL([WITH_JAVA_RUNTIME_LIBRARY_OPENJDK], test x"${WITH_JAVA_RUNTIME_LIBRARY}" = "xopenjdk" -o x"${WITH_JAVA_RUNTIME_LIBRARY}" = "xopenjdk7")
++AM_CONDITIONAL([WITH_JAVA_RUNTIME_LIBRARY_OPENJDK], test x"${WITH_JAVA_RUNTIME_LIBRARY}" = "xopenjdk" -o x"${WITH_JAVA_RUNTIME_LIBRARY}" = "xopenjdk7" -o x"${WITH_JAVA_RUNTIME_LIBRARY}" = "xopenjdk8")
+ AM_CONDITIONAL([WITH_JAVA_RUNTIME_LIBRARY_OPENJDK_7], test x"${WITH_JAVA_RUNTIME_LIBRARY}" = "xopenjdk7")
++AM_CONDITIONAL([WITH_JAVA_RUNTIME_LIBRARY_OPENJDK_8], test x"${WITH_JAVA_RUNTIME_LIBRARY}" = "xopenjdk8")
+ ])
+
+
+diff -r c182f119eaad src/native/vm/openjdk/jvm.cpp
+--- cacao/cacao/src/native/vm/openjdk/jvm.cpp Fri Dec 12 22:14:45 2014 +0100
++++ cacao/cacao/src/native/vm/openjdk/jvm.cpp Thu May 14 03:34:48 2015 +0100
+@@ -3733,7 +3733,9 @@
+ info->update_version = 0;
+ info->special_update_version = 0;
+ info->is_attach_supported = 0;
++#ifndef WITH_JAVA_RUNTIME_LIBRARY_OPENJDK_8
+ info->is_kernel_jvm = 0;
++#endif
+ }
+
+
More information about the distro-pkg-dev
mailing list