changeset in /hg/icedtea6: Merge.
Andrew John Hughes
gnu_andrew at member.fsf.org
Fri Nov 7 06:51:03 PST 2008
changeset df4bef3a43ee in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=df4bef3a43ee
description:
Merge.
diffstat:
4 files changed, 59 insertions(+), 4 deletions(-)
ChangeLog | 18 +++++++++++++++++-
Makefile.am | 7 +++++--
acinclude.m4 | 12 +++++++++++-
patches/icedtea-ecj-jopt.patch | 26 ++++++++++++++++++++++++++
diffs (121 lines):
diff -r 26c630b5f91d -r df4bef3a43ee ChangeLog
--- a/ChangeLog Fri Nov 07 14:48:58 2008 +0000
+++ b/ChangeLog Fri Nov 07 14:50:55 2008 +0000
@@ -2,7 +2,21 @@ 2008-11-07 Andrew John Hughes <ahughes
* Makefile.am: Use 'node|short' instead of 'rev'
for Mercurial revision number.
-
+
+2008-10-30 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am: Add bootstrap-directory-symlink
+ target to icedtea-ecj so it works as the user-specified
+ make target.
+
+2008-10-22 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am: Pass JAR_KNOWS_J_OPTIONS to ecj make.
+ * acinclude.m4: Check whether or not jar supports -J
+ options at the end.
+ * patches/icedtea-ecj-jopt.patch: Only add -J options
+ to jar in JDK and CORBA when supported.
+
2008-10-29 Mark Wielaard <mark at klomp.org>
* patches/icedtea-6761856-freetypescaler.patch: New patch.
@@ -168,6 +182,8 @@ 2008-10-31 Lillian Angel <langel at redha
* Makefile.am: Updated for new visualvm 1.0.1.
* patches/icedtea-visualvm.patch: Updated.
+=======
+>>>>>>> other
2008-10-29 Gary Benson <gbenson at redhat.com>
PR icedtea/238:
diff -r 26c630b5f91d -r df4bef3a43ee Makefile.am
--- a/Makefile.am Fri Nov 07 14:48:58 2008 +0000
+++ b/Makefile.am Fri Nov 07 14:50:55 2008 +0000
@@ -247,6 +247,7 @@ ICEDTEA_ENV_ECJ = \
"JAVAC=" \
"RHINO_JAR=$(RHINO_JAR)" \
"JAR_KNOWS_ATFILE=$(JAR_KNOWS_ATFILE)" \
+ "JAR_KNOWS_J_OPTIONS=$(JAR_KNOWS_J_OPTIONS)" \
"JAR_ACCEPTS_STDIN_LIST=$(JAR_ACCEPTS_STDIN_LIST)"
if WITH_CACAO
@@ -771,7 +772,8 @@ stamps/ports-ecj.stamp: stamps/extract-e
# Patch OpenJDK for plug replacements and ecj.
ICEDTEA_ECJ_PATCHES = patches/icedtea-ecj.patch \
- patches/icedtea-ecj-spp.patch
+ patches/icedtea-ecj-spp.patch \
+ patches/icedtea-ecj-jopt.patch
stamps/patch-ecj.stamp: stamps/extract-ecj.stamp
mkdir -p stamps; \
@@ -1118,7 +1120,8 @@ stamps/native-ecj.stamp:
fi ; \
touch stamps/native-ecj.stamp
-stamps/icedtea-ecj.stamp: stamps/hotspot-tools.stamp stamps/plugs.stamp \
+stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \
+ stamps/hotspot-tools.stamp stamps/plugs.stamp \
stamps/ports-ecj.stamp stamps/patch-ecj.stamp stamps/cacao.stamp
$(MAKE) \
$(ICEDTEA_ENV_ECJ) \
diff -r 26c630b5f91d -r df4bef3a43ee acinclude.m4
--- a/acinclude.m4 Fri Nov 07 14:48:58 2008 +0000
+++ b/acinclude.m4 Fri Nov 07 14:50:55 2008 +0000
@@ -351,10 +351,20 @@ EOF
JAR_ACCEPTS_STDIN_LIST=
AC_MSG_RESULT(no)
fi
- rm -f _config.txt _config.list _config.jar
+ rm -f _config.list _config.jar
+ AC_MSG_CHECKING([whether jar supports -J options at the end])
+ if $JAR cf _config.jar _config.txt -J-Xmx896m 2>/dev/null; then
+ JAR_KNOWS_J_OPTIONS=1
+ AC_MSG_RESULT(yes)
+ else
+ JAR_KNOWS_J_OPTIONS=
+ AC_MSG_RESULT(no)
+ fi
+ rm -f _config.txt _config.jar
AC_SUBST(JAR)
AC_SUBST(JAR_KNOWS_ATFILE)
AC_SUBST(JAR_ACCEPTS_STDIN_LIST)
+ AC_SUBST(JAR_KNOWS_J_OPTIONS)
])
AC_DEFUN([FIND_RMIC],
diff -r 26c630b5f91d -r df4bef3a43ee patches/icedtea-ecj-jopt.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-ecj-jopt.patch Fri Nov 07 14:50:55 2008 +0000
@@ -0,0 +1,26 @@
+diff -Nru openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk openjdk-ecj/corba/make/common/shared/Defs-java.gmk
+--- openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk 2008-10-22 18:45:43.000000000 +0100
++++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk 2008-10-22 18:49:29.000000000 +0100
+@@ -75,7 +75,9 @@
+ JAVAC_JVM_FLAGS += $(JAVA_TOOLS_FLAGS:%=-J%)
+
+ # The jar -J options are special, must be added at the end of the command line
++ifneq (,$(JAR_KNOWS_J_OPTIONS))
+ JAR_JFLAGS = $(JAVA_TOOLS_FLAGS:%=-J%)
++endif
+
+ # JAVA_TOOLS_DIR is the default location to find Java tools to run, if
+ # langtools is not available.
+diff -Nru openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk openjdk-ecj/jdk/make/common/shared/Defs-java.gmk
+--- openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk 2008-10-22 19:14:30.000000000 +0100
++++ openjdk-ecj/jdk/make/common/shared/Defs-java.gmk 2008-10-22 19:15:00.000000000 +0100
+@@ -82,7 +82,9 @@
+ JAVAC_JVM_FLAGS += $(JAVA_TOOLS_FLAGS:%=-J%)
+
+ # The jar -J options are special, must be added at the end of the command line
++ifneq (,$(JAR_KNOWS_J_OPTIONS))
+ JAR_JFLAGS = $(JAVA_TOOLS_FLAGS:%=-J%)
++endif
+
+ # JAVA_TOOLS_DIR is the default location to find Java tools to run, if
+ # langtools is not available.
More information about the distro-pkg-dev
mailing list