Mercurial > hg > icedtea9

changeset 2557:82ddf394f5d9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PR2355: CACAO build fails to use JRE layout 2015-05-13 Andrew John Hughes <gnu_andrew@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.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Thu, 14 May 2015 03:43:26 +0100
parents 9f4be0a502ce
children 04327567ef0a
files ChangeLog NEWS patches/cacao/pr2349.patch
diffstat 3 files changed, 39 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu May 14 03:34:34 2015 +0100
+++ b/ChangeLog	Thu May 14 03:43:26 2015 +0100
@@ -1,3 +1,11 @@
+2015-05-13  Andrew John Hughes  <gnu_andrew@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@member.fsf.org>
 
 	PR2354: stamps/cacao.stamp tries to touch a file
--- a/NEWS	Thu May 14 03:34:34 2015 +0100
+++ b/NEWS	Thu May 14 03:43:26 2015 +0100
@@ -103,7 +103,8 @@
   - 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
--- a/patches/cacao/pr2349.patch	Thu May 14 03:34:34 2015 +0100
+++ b/patches/cacao/pr2349.patch	Thu May 14 03:43:26 2015 +0100
@@ -1,6 +1,27 @@
+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	Wed May 13 19:08:20 2015 +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
@@ -12,7 +33,7 @@
                    *)
 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	Wed May 13 18:50:10 2015 +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)
@@ -38,9 +59,12 @@
                  openjdk7)
                      WITH_JAVA_RUNTIME_LIBRARY=openjdk7
                      AC_DEFINE([WITH_JAVA_RUNTIME_LIBRARY_OPENJDK], 1, [use OpenJDK's Java SE classes])
-@@ -62,6 +71,7 @@
+@@ -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")
++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")
  ])
@@ -48,7 +72,7 @@
  
 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	Wed May 13 18:50:10 2015 +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;
@@ -59,24 +83,3 @@
  }
  
  
-diff -r c182f119eaad configure.ac
---- cacao/cacao/configure.ac	Fri Dec 12 22:14:45 2014 +0100
-+++ cacao/cacao/configure.ac	Wed May 13 22:09:49 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})