changeset in /hg/icedtea: 2008-10-22 Andrew John Hughes <ahugh...
Andrew John Hughes
ahughes at redhat.com
Thu Oct 23 01:45:02 PDT 2008
changeset 1db6ec885d9f in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1db6ec885d9f
description:
2008-10-22 Andrew John Hughes <ahughes at redhat.com>
* patches/icedtea-constructor-properties.patch:
Removed.
* Makefile.am: Bump to b37, 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.
diffstat:
5 files changed, 54 insertions(+), 20 deletions(-)
ChangeLog | 11 +++++++++++
Makefile.am | 11 ++++++-----
acinclude.m4 | 12 +++++++++++-
patches/icedtea-constructor-properties.patch | 14 --------------
patches/icedtea-ecj-jopt.patch | 26 ++++++++++++++++++++++++++
diffs (130 lines):
diff -r 2c18c20ea81c -r 1db6ec885d9f ChangeLog
--- a/ChangeLog Sun Oct 19 05:20:39 2008 +0100
+++ b/ChangeLog Thu Oct 23 09:43:20 2008 +0100
@@ -1,3 +1,14 @@ 2008-10-19 Andrew John Hughes <gnu_and
+2008-10-22 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/icedtea-constructor-properties.patch:
+ Removed.
+ * Makefile.am: Bump to b37, 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-19 Andrew John Hughes <gnu_andrew at member.fsf.org>
* Makefile.am:
diff -r 2c18c20ea81c -r 1db6ec885d9f Makefile.am
--- a/Makefile.am Sun Oct 19 05:20:39 2008 +0100
+++ b/Makefile.am Thu Oct 23 09:43:20 2008 +0100
@@ -1,6 +1,6 @@ OPENJDK_DATE = 25_sep_2008
-OPENJDK_DATE = 25_sep_2008
-OPENJDK_MD5SUM = 6432f04891bc0e61142a73bb8500314c
-OPENJDK_VERSION = b36
+OPENJDK_DATE = 09_oct_2008
+OPENJDK_MD5SUM = 979a7f60de588f1f416657d41ad5e63c
+OPENJDK_VERSION = b37
CACAO_VERSION = 0.99.3
CACAO_MD5SUM = 80de3ad344c1a20c086ec5f1390bd1b8
@@ -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
@@ -567,7 +568,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-shark-build.patch \
patches/icedtea-toolkit.patch \
patches/icedtea-security-updates.patch \
- patches/icedtea-constructor-properties.patch \
patches/icedtea-jsoundhs.patch \
patches/icedtea-jdk-docs-target.patch \
patches/icedtea-mbeanintrospector.patch \
@@ -871,7 +871,8 @@ stamps/ports-ecj.stamp: stamps/clone-ecj
# 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/clone-ecj.stamp
mkdir -p stamps; \
diff -r 2c18c20ea81c -r 1db6ec885d9f acinclude.m4
--- a/acinclude.m4 Sun Oct 19 05:20:39 2008 +0100
+++ b/acinclude.m4 Thu Oct 23 09:43:20 2008 +0100
@@ -349,10 +349,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 2c18c20ea81c -r 1db6ec885d9f patches/icedtea-constructor-properties.patch
--- a/patches/icedtea-constructor-properties.patch Sun Oct 19 05:20:39 2008 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/jmx/mbeanserver/DefaultMXBeanMappingFactory.java openjdk/jdk/src/share/classes/com/sun/jmx/mbeanserver/DefaultMXBeanMappingFactory.java
---- openjdk.orig/jdk/src/share/classes/com/sun/jmx/mbeanserver/DefaultMXBeanMappingFactory.java 2008-07-13 01:25:15.000000000 +0100
-+++ openjdk/jdk/src/share/classes/com/sun/jmx/mbeanserver/DefaultMXBeanMappingFactory.java 2008-07-13 01:28:31.000000000 +0100
-@@ -1207,8 +1207,8 @@
- // so we can test unambiguity.
- Set<BitSet> getterIndexSets = newSet();
- for (Constructor constr : annotatedConstrList) {
-- String[] propertyNames =
-- constr.getAnnotation(propertyNamesClass).value();
-+ String[] propertyNames = ((ConstructorProperties)
-+ constr.getAnnotation(propertyNamesClass)).value();
-
- Type[] paramTypes = constr.getGenericParameterTypes();
- if (paramTypes.length != propertyNames.length) {
diff -r 2c18c20ea81c -r 1db6ec885d9f patches/icedtea-ecj-jopt.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-ecj-jopt.patch Thu Oct 23 09:43:20 2008 +0100
@@ -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