/hg/icedtea7: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Jun 12 16:01:08 PDT 2012
changeset 1a9e619bc32e in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=1a9e619bc32e
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Jun 12 08:07:36 2012 +0100
Bring compiler detection into line with other jdk tools and check java/javac work before running other macros.
2012-03-20 Andrew John Hughes <ahughes at redhat.com>
* acinclude.m4:
(IT_FIND_COMPILER): Define only once and
rename from IT_FIND_JAVA_COMPILER.
(IT_FIND_ECJ): Use same form as detection
for java, javah, jar and rmic.
(IT_FIND_JAVAC): Likewise.
(IT_CHECK_JAVA_AND_JAVAC_WORK): New macro to check
java and javac actually work together to compile code
before running other tests such as the dtdtype one.
(IT_CHECK_FOR_CLASS): Depend on java/javac working.
(IT_GETDTDTYPE_CHECK): Likewise. Add -target 5.
(IT_JAVAH): Depend on java/javac working.
* configure.ac: Invoke IT_FIND_COMPILER rather than
IT_FIND_JAVA_COMPILER.
changeset e6d81fc2c943 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=e6d81fc2c943
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Jun 13 00:01:00 2012 +0100
PR986: Allow CACAO builds of IcedTea to be able to build IcedTea without bootstrap.
2012-06-12 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR986
* Makefile.am:
(ICEDTEA_PATCHES): Add memory patch when
building using CACAO as well, even if the
result is not a CACAO build.
* acinclude.m4:
(IT_USING_CACAO): New macro; detects use of
CACAO as the build VM so memory limits can
be raised accordingly.
* configure.ac: Call IT_USING_CACAO.
* patches/cacao/launcher.patch:
Move memory increase to memory.patch.
* patches/cacao/memory.patch:
Extend with additional cases in HotSpot and
the JDK.
diffstat:
ChangeLog | 35 +++++++++
Makefile.am | 5 +
NEWS | 3 +
acinclude.m4 | 153 ++++++++++++++++++++++++++++--------------
configure.ac | 3 +-
patches/cacao/launcher.patch | 12 ---
patches/cacao/memory.patch | 82 ++++++++++++++++++++++-
7 files changed, 225 insertions(+), 68 deletions(-)
diffs (435 lines):
diff -r 7ceb431c104f -r e6d81fc2c943 ChangeLog
--- a/ChangeLog Tue Jun 12 00:05:49 2012 +0100
+++ b/ChangeLog Wed Jun 13 00:01:00 2012 +0100
@@ -1,3 +1,38 @@
+2012-06-12 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR986
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add memory patch when
+ building using CACAO as well, even if the
+ result is not a CACAO build.
+ * acinclude.m4:
+ (IT_USING_CACAO): New macro; detects use of
+ CACAO as the build VM so memory limits can
+ be raised accordingly.
+ * configure.ac: Call IT_USING_CACAO.
+ * patches/cacao/launcher.patch:
+ Move memory increase to memory.patch.
+ * patches/cacao/memory.patch:
+ Extend with additional cases in HotSpot and
+ the JDK.
+
+2012-03-20 Andrew John Hughes <ahughes at redhat.com>
+
+ * acinclude.m4:
+ (IT_FIND_COMPILER): Define only once and
+ rename from IT_FIND_JAVA_COMPILER.
+ (IT_FIND_ECJ): Use same form as detection
+ for java, javah, jar and rmic.
+ (IT_FIND_JAVAC): Likewise.
+ (IT_CHECK_JAVA_AND_JAVAC_WORK): New macro to check
+ java and javac actually work together to compile code
+ before running other tests such as the dtdtype one.
+ (IT_CHECK_FOR_CLASS): Depend on java/javac working.
+ (IT_GETDTDTYPE_CHECK): Likewise. Add -target 5.
+ (IT_JAVAH): Depend on java/javac working.
+ * configure.ac: Invoke IT_FIND_COMPILER rather than
+ IT_FIND_JAVA_COMPILER.
+
2012-06-11 Andrew John Hughes <gnu_andrew at member.fsf.org>
* Makefile.am:
diff -r 7ceb431c104f -r e6d81fc2c943 Makefile.am
--- a/Makefile.am Tue Jun 12 00:05:49 2012 +0100
+++ b/Makefile.am Wed Jun 13 00:01:00 2012 +0100
@@ -249,6 +249,11 @@
patches/cacao/launcher.patch \
patches/cacao/jsig.patch \
patches/cacao/memory.patch
+else
+if USING_CACAO
+ICEDTEA_PATCHES += \
+ patches/cacao/memory.patch
+endif
endif
if ENABLE_CACAO
diff -r 7ceb431c104f -r e6d81fc2c943 NEWS
--- a/NEWS Tue Jun 12 00:05:49 2012 +0100
+++ b/NEWS Wed Jun 13 00:01:00 2012 +0100
@@ -12,6 +12,9 @@
New in release 2.3 (2012-XX-XX):
+* Bug fixes
+ - PR986: IcedTea7 fails to build with IcedTea6 CACAO due to low max heap size
+
New in release 2.2 (2012-05-30):
* Bug fixes
diff -r 7ceb431c104f -r e6d81fc2c943 acinclude.m4
--- a/acinclude.m4 Tue Jun 12 00:05:49 2012 +0100
+++ b/acinclude.m4 Wed Jun 13 00:01:00 2012 +0100
@@ -117,50 +117,41 @@
AC_SUBST(OS_PATH)
])
-AC_DEFUN([IT_FIND_JAVA_COMPILER],
+AC_DEFUN([IT_FIND_COMPILER],
[
- JAVAC=${SYSTEM_JDK_DIR}/bin/javac
IT_FIND_JAVAC
IT_FIND_ECJ
IT_USING_ECJ
+ AC_SUBST(ECJ)
AC_SUBST(JAVAC)
])
-AC_DEFUN([IT_FIND_ECJ],
+AC_DEFUN_ONCE([IT_FIND_ECJ],
[
+ ECJ_DEFAULT=/usr/bin/ecj
+ AC_MSG_CHECKING([if an ecj binary was specified])
AC_ARG_WITH([ecj],
- [AS_HELP_STRING([--with-ecj[[=PATH]]],the path to an ecj binary)],
+ [AS_HELP_STRING(--with-ecj,bytecode compilation with ecj)],
[
- if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then
- IT_CHECK_ECJ(${withval})
+ if test "x${withval}" = "xyes"; then
+ ECJ=no
else
- if test "x${withval}" != xno; then
- IT_CHECK_ECJ
- fi
+ ECJ="${withval}"
fi
],
[
- IT_CHECK_ECJ
+ ECJ=no
])
- if test "x${JAVAC}" = "x"; then
- if test "x{ECJ}" != "x"; then
- JAVAC="${ECJ}"
- fi
+ AC_MSG_RESULT(${ECJ})
+ if test "x${ECJ}" = "xno"; then
+ ECJ=${ECJ_DEFAULT}
fi
-])
-
-AC_DEFUN([IT_CHECK_ECJ],
-[
- if test "x$1" != x; then
- if test -f "$1"; then
- AC_MSG_CHECKING(for ecj)
- ECJ="$1"
- AC_MSG_RESULT(${ECJ})
- else
- AC_PATH_PROG(ECJ, "$1")
- fi
+ AC_MSG_CHECKING([if $ECJ is a valid executable file])
+ if test -x "${ECJ}" && test -f "${ECJ}"; then
+ AC_MSG_RESULT([yes])
else
+ ECJ=""
AC_PATH_PROG(ECJ, "ecj")
if test -z "${ECJ}"; then
AC_PATH_PROG(ECJ, "ecj-3.1")
@@ -171,43 +162,45 @@
if test -z "${ECJ}"; then
AC_PATH_PROG(ECJ, "ecj-3.3")
fi
+ if test -z "${ECJ}"; then
+ AC_PATH_PROG(ECJ, "ecj-3.4")
+ fi
fi
])
-AC_DEFUN([IT_FIND_JAVAC],
+AC_DEFUN_ONCE([IT_FIND_JAVAC],
[
+ JAVAC_DEFAULT=${SYSTEM_JDK_DIR}/bin/javac
+ AC_MSG_CHECKING([if a javac binary was specified])
AC_ARG_WITH([javac],
[AS_HELP_STRING([--with-javac[[=PATH]]],the path to a javac binary)],
[
- if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then
- IT_CHECK_JAVAC(${withval})
+ if test "x${withval}" = "xyes"; then
+ JAVAC=no
else
- if test "x${withval}" != xno; then
- IT_CHECK_JAVAC(${JAVAC})
- fi
+ JAVAC="${withval}"
fi
],
- [
- IT_CHECK_JAVAC(${JAVAC})
+ [
+ JAVAC=no
+ ])
+ AC_MSG_RESULT(${JAVAC})
+ if test "x${JAVAC}" = "xno"; then
+ JAVAC=${JAVAC_DEFAULT}
+ fi
+ AC_MSG_CHECKING([if $JAVAC is a valid executable file])
+ if test -x "${JAVAC}" && test -f "${JAVAC}"; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ JAVAC=""
+ AC_PATH_PROG(JAVAC, "javac")
+ fi
+ AC_SUBST(JAVAC)
])
])
-AC_DEFUN([IT_CHECK_JAVAC],
-[
- if test "x$1" != x; then
- if test -f "$1"; then
- AC_MSG_CHECKING(for javac)
- JAVAC="$1"
- AC_MSG_RESULT(${JAVAC})
- else
- AC_PATH_PROG(JAVAC, "$1")
- fi
- else
- AC_PATH_PROG(JAVAC, "javac")
- fi
-])
-
-AC_DEFUN([IT_FIND_JAVA],
+AC_DEFUN_ONCE([IT_FIND_JAVA],
[
JAVA_DEFAULT=${SYSTEM_JDK_DIR}/bin/java
AC_MSG_CHECKING([if a java binary was specified])
@@ -1158,6 +1151,7 @@
])
AC_DEFUN([IT_JAVAH],[
+AC_REQUIRE([IT_CHECK_JAVA_AND_JAVAC_WORK])
AC_CACHE_CHECK([if $JAVAH exhibits Classpath bug 39408], it_cv_cp39408_javah, [
SUPERCLASS=Test.java
SUBCLASS=TestImpl.java
@@ -1452,6 +1446,44 @@
AC_CONFIG_FILES([tz.properties])
])
+dnl check that javac and java work
+AC_DEFUN_ONCE([IT_CHECK_JAVA_AND_JAVAC_WORK],[
+ AC_REQUIRE([IT_FIND_JAVA])
+ AC_REQUIRE([IT_FIND_COMPILER])
+ AC_CACHE_CHECK([if the VM and compiler work together], it_cv_jdk_works, [
+ CLASS=Test.java
+ BYTECODE=$(echo $CLASS|sed 's#\.java##')
+ mkdir tmp.$$
+ cd tmp.$$
+ cat << \EOF > $CLASS
+[/* [#]line __oline__ "configure" */
+
+public class Test
+{
+ public static void main(String[] args)
+ {
+ System.out.println("Hello World!");
+ }
+}]
+EOF
+ if $JAVAC -cp . $JAVACFLAGS -source 5 -target 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
+ if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then
+ it_cv_jdk_works=yes;
+ else
+ it_cv_jdk_works=no;
+ AC_MSG_ERROR([VM failed to run compiled class.])
+ fi
+ else
+ it_cv_jdk_works=no;
+ AC_MSG_ERROR([Compiler failed to compile Java code.])
+ fi
+ rm -f $CLASS *.class
+ cd ..
+ rmdir tmp.$$
+ ])
+AC_PROVIDE([$0])dnl
+])
+
dnl Generic macro to check for a Java class
dnl Takes two arguments: the name of the macro
dnl and the name of the class. The macro name
@@ -1459,6 +1491,7 @@
dnl replaced by '_' and all letters capitalised.
dnl e.g. IT_CHECK_FOR_CLASS([JAVA_UTIL_SCANNER],[java.util.Scanner])
AC_DEFUN([IT_CHECK_FOR_CLASS],[
+AC_REQUIRE([IT_CHECK_JAVA_AND_JAVAC_WORK])
AC_CACHE_CHECK([if $2 is missing], it_cv_$1, [
CLASS=Test.java
BYTECODE=$(echo $CLASS|sed 's#\.java##')
@@ -1504,7 +1537,8 @@
AC_PROVIDE([$0])dnl
])
-AC_DEFUN([IT_GETDTDTYPE_CHECK],[
+AC_DEFUN_ONCE([IT_GETDTDTYPE_CHECK],[
+ AC_REQUIRE([IT_CHECK_JAVA_AND_JAVAC_WORK])
AC_CACHE_CHECK([if javax.xml.stream.events.Attribute.getDTDType() wrongly returns a QName], it_cv_dtdtype, [
CLASS=Test.java
BYTECODE=$(echo $CLASS|sed 's#\.java##')
@@ -1561,7 +1595,7 @@
}
}]
EOF
- if $JAVAC -cp . $JAVACFLAGS -source 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
+ if $JAVAC -cp . $JAVACFLAGS -source 5 -target 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then
it_cv_dtdtype=no;
else
@@ -2244,3 +2278,18 @@
AC_SUBST(PAX_COMMAND)
AC_SUBST(PAX_COMMAND_ARGS)
])
+
+AC_DEFUN([IT_USING_CACAO],[
+ AC_REQUIRE([IT_FIND_JAVA])
+ AC_CACHE_CHECK([if we are using CACAO as the build VM], it_cv_cacao, [
+ if $JAVA -version 2>&1| grep '^CACAO' >&AS_MESSAGE_LOG_FD ; then
+ it_cv_cacao=yes;
+ else
+ it_cv_cacao=no;
+ fi
+ ])
+ USING_CACAO=$it_cv_cacao
+ AC_SUBST(USING_CACAO)
+ AM_CONDITIONAL(USING_CACAO, test "x${USING_CACAO}" = "xyes")
+ AC_PROVIDE([$0])dnl
+])
diff -r 7ceb431c104f -r e6d81fc2c943 configure.ac
--- a/configure.ac Tue Jun 12 00:05:49 2012 +0100
+++ b/configure.ac Wed Jun 13 00:01:00 2012 +0100
@@ -97,11 +97,12 @@
IT_CHECK_IF_DOWNLOADING
IT_CHECK_FOR_JDK
IT_FIND_JAVA
-IT_FIND_JAVA_COMPILER
+IT_FIND_COMPILER
IT_FIND_JAVAH
IT_FIND_JAR
IT_FIND_RMIC
IT_FIND_NATIVE2ASCII
+IT_USING_CACAO
if test "x$enable_bootstrap" = "xyes"; then
IT_FIND_ECJ_JAR
IT_FIND_TOOL([XSLTPROC], [xsltproc])
diff -r 7ceb431c104f -r e6d81fc2c943 patches/cacao/launcher.patch
--- a/patches/cacao/launcher.patch Tue Jun 12 00:05:49 2012 +0100
+++ b/patches/cacao/launcher.patch Wed Jun 13 00:01:00 2012 +0100
@@ -1,15 +1,3 @@
-diff -Nru openjdk.orig/jdk/make/docs/Makefile openjdk/jdk/make/docs/Makefile
---- openjdk.orig/jdk/make/docs/Makefile 2012-03-21 17:09:55.000000000 +0000
-+++ openjdk/jdk/make/docs/Makefile 2012-03-23 00:46:49.461847958 +0000
-@@ -73,7 +73,7 @@
- else ifeq ($(ARCH),universal)
- MAX_VM_MEMORY = 1024
- else
-- MAX_VM_MEMORY = 512
-+ MAX_VM_MEMORY = 768
- endif
-
- # List of all possible directories for javadoc to look for sources
diff -Nru openjdk.orig/jdk/src/share/bin/java.c openjdk/jdk/src/share/bin/java.c
--- openjdk.orig/jdk/src/share/bin/java.c 2012-03-21 17:09:55.000000000 +0000
+++ openjdk/jdk/src/share/bin/java.c 2012-03-23 00:46:49.461847958 +0000
diff -r 7ceb431c104f -r e6d81fc2c943 patches/cacao/memory.patch
--- a/patches/cacao/memory.patch Tue Jun 12 00:05:49 2012 +0100
+++ b/patches/cacao/memory.patch Wed Jun 13 00:01:00 2012 +0100
@@ -1,6 +1,82 @@
---- openjdk.orig/langtools/make/build.xml 2010-06-01 11:25:40.145287816 +0100
-+++ openjdk/langtools/make/build.xml 2010-06-21 21:48:41.000000000 +0100
-@@ -554,6 +554,7 @@
+diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/rules.make openjdk/hotspot/make/bsd/makefiles/rules.make
+--- openjdk.orig/hotspot/make/bsd/makefiles/rules.make 2012-06-08 17:13:09.000000000 +0100
++++ openjdk/hotspot/make/bsd/makefiles/rules.make 2012-06-12 10:50:20.974290246 +0100
+@@ -128,7 +128,7 @@
+ # Settings for javac
+ BOOT_SOURCE_LANGUAGE_VERSION = 6
+ BOOT_TARGET_CLASS_VERSION = 6
+-JAVAC_FLAGS = -g -encoding ascii
++JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
+ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
+
+ # With parallel makes, print a message at the end of compilation.
+diff -Nru openjdk.orig/hotspot/make/linux/makefiles/rules.make openjdk/hotspot/make/linux/makefiles/rules.make
+--- openjdk.orig/hotspot/make/linux/makefiles/rules.make 2012-06-08 17:13:09.000000000 +0100
++++ openjdk/hotspot/make/linux/makefiles/rules.make 2012-06-12 10:50:20.982290377 +0100
+@@ -128,7 +128,7 @@
+ # Settings for javac
+ BOOT_SOURCE_LANGUAGE_VERSION = 6
+ BOOT_TARGET_CLASS_VERSION = 6
+-JAVAC_FLAGS = -g -encoding ascii
++JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
+ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
+
+ # With parallel makes, print a message at the end of compilation.
+diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/rules.make openjdk/hotspot/make/solaris/makefiles/rules.make
+--- openjdk.orig/hotspot/make/solaris/makefiles/rules.make 2012-06-08 17:13:09.000000000 +0100
++++ openjdk/hotspot/make/solaris/makefiles/rules.make 2012-06-12 10:50:20.982290377 +0100
+@@ -120,7 +120,7 @@
+ # Settings for javac
+ BOOT_SOURCE_LANGUAGE_VERSION = 6
+ BOOT_TARGET_CLASS_VERSION = 6
+-JAVAC_FLAGS = -g -encoding ascii
++JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
+ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
+
+ # With parallel makes, print a message at the end of compilation.
+diff -Nru openjdk.orig/hotspot/make/windows/makefiles/rules.make openjdk/hotspot/make/windows/makefiles/rules.make
+--- openjdk.orig/hotspot/make/windows/makefiles/rules.make 2012-06-08 17:13:09.000000000 +0100
++++ openjdk/hotspot/make/windows/makefiles/rules.make 2012-06-12 10:50:20.982290377 +0100
+@@ -45,7 +45,7 @@
+ # Settings for javac
+ BOOT_SOURCE_LANGUAGE_VERSION=6
+ BOOT_TARGET_CLASS_VERSION=6
+-JAVAC_FLAGS=-g -encoding ascii
++JAVAC_FLAGS=-g -encoding ascii -J-Xmx256m
+ BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
+
+ ProjectFile=jvm.vcproj
+diff -Nru openjdk.orig/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk
+--- openjdk.orig/jdk/make/common/shared/Platform.gmk 2012-06-08 17:12:17.000000000 +0100
++++ openjdk/jdk/make/common/shared/Platform.gmk 2012-06-12 10:50:20.982290377 +0100
+@@ -537,7 +537,7 @@
+ else \
+ echo "false"; \
+ fi)
+- MAX_VM_MEMORY := 512
++ MAX_VM_MEMORY := 1536
+ MIN_VM_MEMORY := $(MAX_VM_MEMORY)
+ else
+ MB_OF_MEMORY := unknown
+diff -Nru openjdk.orig/jdk/make/docs/Makefile openjdk/jdk/make/docs/Makefile
+--- openjdk.orig/jdk/make/docs/Makefile 2012-06-08 17:12:17.000000000 +0100
++++ openjdk/jdk/make/docs/Makefile 2012-06-12 11:09:31.616702981 +0100
+@@ -69,9 +69,9 @@
+ # NOTE: javadoc will not complete without these larger settings.
+ # WARNING: This could cause thrashing on low memory machines.
+ ifeq ($(ARCH_DATA_MODEL),64)
+- MAX_VM_MEMORY = 1536
++ MAX_VM_MEMORY = 1792
+ else ifeq ($(ARCH),universal)
+- MAX_VM_MEMORY = 1536
++ MAX_VM_MEMORY = 1792
+ else
+ MAX_VM_MEMORY = 768
+ endif
+diff -Nru openjdk.orig/langtools/make/build.xml openjdk/langtools/make/build.xml
+--- openjdk.orig/langtools/make/build.xml 2012-06-08 17:12:36.000000000 +0100
++++ openjdk/langtools/make/build.xml 2012-06-12 10:50:20.974290246 +0100
+@@ -796,6 +796,7 @@
<compilerarg value="-implicit:none"/>
<compilerarg value="-Xprefer:source"/>
<compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
More information about the distro-pkg-dev
mailing list