changeset in /hg/icedtea: Bump to b64.
Andrew John Hughes
ahughes at redhat.com
Wed Jul 15 05:37:19 PDT 2009
changeset e2ff1b52131d in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=e2ff1b52131d
description:
Bump to b64.
2009-07-14 Andrew John Hughes <ahughes at redhat.com>
* patches/icedtea-messageutils.patch,
* patches/icedtea-toolkit.patch:
Dropped, committed upstream by Lillian.
* Makefile.am: Bump to b64.
* patches/ecj/icedtea-dbcs.patch,
* patches/ecj/icedtea.patch,
* patches/icedtea-linker-libs-order.patch,
* patches/icedtea-webstart.patch:
Recreated.
diffstat:
8 files changed, 107 insertions(+), 153 deletions(-)
ChangeLog | 12 ++
Makefile.am | 36 +++----
patches/ecj/icedtea-dbcs.patch | 6 -
patches/ecj/icedtea.patch | 152 +++++++++++++------------------
patches/icedtea-linker-libs-order.patch | 12 +-
patches/icedtea-messageutils.patch | 12 --
patches/icedtea-toolkit.patch | 11 --
patches/icedtea-webstart.patch | 19 +--
diffs (truncated from 613 to 500 lines):
diff -r e944184d6eda -r e2ff1b52131d ChangeLog
--- a/ChangeLog Thu Jul 09 19:52:10 2009 +0100
+++ b/ChangeLog Tue Jul 14 19:44:20 2009 +0100
@@ -1,3 +1,15 @@ 2009-07-09 Andrew John Hughes <ahughes
+2009-07-14 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/icedtea-messageutils.patch,
+ * patches/icedtea-toolkit.patch:
+ Dropped, committed upstream by Lillian.
+ * Makefile.am: Bump to b64.
+ * patches/ecj/icedtea-dbcs.patch,
+ * patches/ecj/icedtea.patch,
+ * patches/icedtea-linker-libs-order.patch,
+ * patches/icedtea-webstart.patch:
+ Recreated.
+
2009-07-09 Andrew John Hughes <ahughes at redhat.com>
* patches/ecj/icedtea-pr40616.patch:
diff -r e944184d6eda -r e2ff1b52131d Makefile.am
--- a/Makefile.am Thu Jul 09 19:52:10 2009 +0100
+++ b/Makefile.am Tue Jul 14 19:44:20 2009 +0100
@@ -1,20 +1,20 @@ OPENJDK_VERSION = b63
-OPENJDK_VERSION = b63
-
-OPENJDK_CHANGESET = 57f7e028c7ad
-CORBA_CHANGESET = d20e45cd539f
-JAXP_CHANGESET = ae449e9c04c1
-JAXWS_CHANGESET = 5b9e8315aab2
-JDK_CHANGESET = 6388560a8d7e
-LANGTOOLS_CHANGESET = 5c2c81120555
-HOTSPOT_CHANGESET = 32c83fb84370
-
-OPENJDK_MD5SUM = 01a2fe09452d8579fb251120e37dc45a
-CORBA_MD5SUM = 865e397135e2b9f8e4a256b4146b6852
-JAXP_MD5SUM = 008c8971c40aca1759dd0129a025f9b8
-JAXWS_MD5SUM = 86d18ba378cb83a2bd33b334c7bd610e
-JDK_MD5SUM = 68b034a7d0906a0f7b471e080b45407a
-LANGTOOLS_MD5SUM = 5ff432cec3ddf86ae5dbd147da1a7f92
-HOTSPOT_MD5SUM = a97947d03665b39b806ddcf2e48b9fc8
+OPENJDK_VERSION = b64
+
+OPENJDK_CHANGESET = 269c1ec4435d
+CORBA_CHANGESET = 047dd27fddb6
+JAXP_CHANGESET = a10eec7a1edf
+JAXWS_CHANGESET = d1788e8fd315
+JDK_CHANGESET = d799a225c668
+LANGTOOLS_CHANGESET = d8f23a81d46f
+HOTSPOT_CHANGESET = ba36394eb84b
+
+OPENJDK_MD5SUM = 377e7f1139d876175dd85629220213c9
+CORBA_MD5SUM = 203e6eb0231ae7848a501ee40fcc256d
+JAXP_MD5SUM = b57ed800ab149e44d4d53525cf58e9a7
+JAXWS_MD5SUM = 768509b4a24dc8e3b060e68e71081f48
+JDK_MD5SUM = dab8727958b03ff1b7992a50545479c3
+LANGTOOLS_MD5SUM = bf1a06f7d30febfb332658b6d7ef5fa5
+HOTSPOT_MD5SUM = 1ffa3dd169e18e9679c56b13c04a0de9
CACAO_VERSION = 0.99.4
CACAO_MD5SUM = 63220327925ace13756ae334c55a3baa
@@ -2037,7 +2037,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-override-redirect-metacity.patch \
patches/icedtea-shark-build.patch \
patches/hotspot/$(HSBUILD)/icedtea-shark-build.patch \
- patches/icedtea-toolkit.patch \
patches/icedtea-security-updates.patch \
patches/icedtea-jdk-docs-target.patch \
patches/icedtea-mbeanintrospector.patch \
@@ -2053,7 +2052,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-arch.patch \
patches/icedtea-signed-types.patch \
patches/icedtea-lc_ctype.patch \
- patches/icedtea-messageutils.patch \
patches/icedtea-xjc.patch \
patches/icedtea-renderer-crossing.patch \
patches/icedtea-tests-jdk.patch \
diff -r e944184d6eda -r e2ff1b52131d patches/ecj/icedtea-dbcs.patch
--- a/patches/ecj/icedtea-dbcs.patch Thu Jul 09 19:52:10 2009 +0100
+++ b/patches/ecj/icedtea-dbcs.patch Tue Jul 14 19:44:20 2009 +0100
@@ -1,6 +1,6 @@ diff -Nru openjdk-ecj.orig/jdk/make/tool
diff -Nru openjdk-ecj.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java openjdk-ecj/jdk/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java
---- openjdk-ecj.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java 2009-07-08 18:00:55.000000000 +0100
-+++ openjdk-ecj/jdk/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java 2009-07-08 23:45:44.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java 2009-07-14 18:00:31.000000000 +0100
++++ openjdk-ecj/jdk/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java 2009-07-14 18:08:30.000000000 +0100
@@ -27,7 +27,6 @@
import java.io.*;
import java.util.Arrays;
@@ -10,7 +10,7 @@ diff -Nru openjdk-ecj.orig/jdk/make/tool
import java.util.regex.*;
import java.nio.charset.*;
@@ -38,9 +37,8 @@
- static Pattern mPattern = Pattern.compile("(\\p{XDigit}++)\\s++(\\p{XDigit}++)(\\s++#.*)?");
+ static Pattern mPattern = Pattern.compile("(?:0x)?(\\p{XDigit}++)\\s++(?:0x)?(\\p{XDigit}++)(?:\\s++#.*)?");
public static void genDBCS(String args[]) throws Exception {
- Scanner s = new Scanner(new File(args[0], args[2]));
diff -r e944184d6eda -r e2ff1b52131d patches/ecj/icedtea.patch
--- a/patches/ecj/icedtea.patch Thu Jul 09 19:52:10 2009 +0100
+++ b/patches/ecj/icedtea.patch Tue Jul 14 19:44:20 2009 +0100
@@ -1,6 +1,6 @@ diff -Nru openjdk-ecj.orig/corba/make/co
diff -Nru openjdk-ecj.orig/corba/make/com/sun/corba/se/Makefile openjdk-ecj/corba/make/com/sun/corba/se/Makefile
--- openjdk-ecj.orig/corba/make/com/sun/corba/se/Makefile 2009-03-30 17:13:01.000000000 +0100
-+++ openjdk-ecj/corba/make/com/sun/corba/se/Makefile 2009-07-01 13:52:45.000000000 +0100
++++ openjdk-ecj/corba/make/com/sun/corba/se/Makefile 2009-07-14 17:47:13.000000000 +0100
@@ -42,7 +42,7 @@
# the rmic iiop backend needs some classes that are part of the impl/util
# package. These classes use log wrappers, so they must be built after
@@ -12,7 +12,7 @@ diff -Nru openjdk-ecj.orig/corba/make/co
diff -Nru openjdk-ecj.orig/corba/make/com/sun/corba/se/org/Makefile openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile
--- openjdk-ecj.orig/corba/make/com/sun/corba/se/org/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile 2009-07-01 13:52:45.000000000 +0100
++++ openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile 2009-07-14 17:47:13.000000000 +0100
@@ -0,0 +1,38 @@
+#
+# Copyright 2001-2005 Sun Microsystems, Inc. All Rights Reserved.
@@ -54,7 +54,7 @@ diff -Nru openjdk-ecj.orig/corba/make/co
+include $(BUILDDIR)/common/Classes.gmk
diff -Nru openjdk-ecj.orig/corba/make/common/Defs.gmk openjdk-ecj/corba/make/common/Defs.gmk
--- openjdk-ecj.orig/corba/make/common/Defs.gmk 2009-03-30 17:13:01.000000000 +0100
-+++ openjdk-ecj/corba/make/common/Defs.gmk 2009-07-01 13:52:45.000000000 +0100
++++ openjdk-ecj/corba/make/common/Defs.gmk 2009-07-14 17:47:13.000000000 +0100
@@ -53,6 +53,13 @@
_OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH)
@@ -88,8 +88,8 @@ diff -Nru openjdk-ecj.orig/corba/make/co
vpath %.java $(VPATH.java)
vpath %.class $(CLASSBINDIR)
diff -Nru openjdk-ecj.orig/corba/make/common/Defs-linux.gmk openjdk-ecj/corba/make/common/Defs-linux.gmk
---- openjdk-ecj.orig/corba/make/common/Defs-linux.gmk 2009-07-01 13:42:16.000000000 +0100
-+++ openjdk-ecj/corba/make/common/Defs-linux.gmk 2009-07-01 13:52:45.000000000 +0100
+--- openjdk-ecj.orig/corba/make/common/Defs-linux.gmk 2009-07-14 17:37:18.000000000 +0100
++++ openjdk-ecj/corba/make/common/Defs-linux.gmk 2009-07-14 17:47:13.000000000 +0100
@@ -276,7 +276,7 @@
fi; \
done)
@@ -101,7 +101,7 @@ diff -Nru openjdk-ecj.orig/corba/make/co
# We want to privatize JVM symbols on Solaris. This is so the user can
diff -Nru openjdk-ecj.orig/corba/make/common/Rules.gmk openjdk-ecj/corba/make/common/Rules.gmk
--- openjdk-ecj.orig/corba/make/common/Rules.gmk 2009-03-30 23:07:09.000000000 +0100
-+++ openjdk-ecj/corba/make/common/Rules.gmk 2009-07-01 13:52:45.000000000 +0100
++++ openjdk-ecj/corba/make/common/Rules.gmk 2009-07-14 17:47:13.000000000 +0100
@@ -201,8 +201,10 @@
$(ECHO) "# Java sources to be compiled: (listed in file $(JAVA_SOURCE_LIST))"; \
$(CAT) $(JAVA_SOURCE_LIST); \
@@ -117,7 +117,7 @@ diff -Nru openjdk-ecj.orig/corba/make/co
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 2009-03-30 23:07:09.000000000 +0100
-+++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk 2009-07-01 13:52:45.000000000 +0100
++++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk 2009-07-14 17:47:13.000000000 +0100
@@ -120,31 +120,14 @@
JAVACFLAGS += $(OTHER_JAVACFLAGS)
@@ -158,7 +158,7 @@ diff -Nru openjdk-ecj.orig/corba/make/co
ifdef JAVAC
diff -Nru openjdk-ecj.orig/corba/make/org/omg/sources/Makefile openjdk-ecj/corba/make/org/omg/sources/Makefile
--- openjdk-ecj.orig/corba/make/org/omg/sources/Makefile 2009-03-30 17:13:01.000000000 +0100
-+++ openjdk-ecj/corba/make/org/omg/sources/Makefile 2009-07-01 13:52:45.000000000 +0100
++++ openjdk-ecj/corba/make/org/omg/sources/Makefile 2009-07-14 17:47:13.000000000 +0100
@@ -93,8 +93,6 @@
POAHELHOLFILES = $(POA_GENERATED_HELP_HOL_java:%=$(GENSRCDIR)/%)
@@ -237,7 +237,7 @@ diff -Nru openjdk-ecj.orig/corba/make/or
diff -Nru openjdk-ecj.orig/corba/make/sun/rmi/corbalogsources/Makefile openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile
--- openjdk-ecj.orig/corba/make/sun/rmi/corbalogsources/Makefile 2009-03-30 23:07:09.000000000 +0100
-+++ openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile 2009-07-01 13:52:45.000000000 +0100
++++ openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile 2009-07-14 17:47:13.000000000 +0100
@@ -172,7 +172,6 @@
ACTIVATIONFILES = $(com_sun_corba_se_spi_activation_java:%=$(GENSRCDIR)/%)
@@ -256,7 +256,7 @@ diff -Nru openjdk-ecj.orig/corba/make/su
diff -Nru openjdk-ecj.orig/jaxp/make/build.xml openjdk-ecj/jaxp/make/build.xml
--- openjdk-ecj.orig/jaxp/make/build.xml 2009-06-30 14:24:48.000000000 +0100
-+++ openjdk-ecj/jaxp/make/build.xml 2009-07-01 13:55:31.000000000 +0100
++++ openjdk-ecj/jaxp/make/build.xml 2009-07-14 17:47:13.000000000 +0100
@@ -71,7 +71,10 @@
<mkdir dir="${build.toolclasses.dir}"/>
<javac srcdir="${make.tools.dir}/StripProperties"
@@ -280,8 +280,8 @@ diff -Nru openjdk-ecj.orig/jaxp/make/bui
<compilerarg line="${javac.version.opt}"/>
</javac>
diff -Nru openjdk-ecj.orig/jaxp/make/Makefile openjdk-ecj/jaxp/make/Makefile
---- openjdk-ecj.orig/jaxp/make/Makefile 2009-07-01 13:42:16.000000000 +0100
-+++ openjdk-ecj/jaxp/make/Makefile 2009-07-01 13:52:45.000000000 +0100
+--- openjdk-ecj.orig/jaxp/make/Makefile 2009-07-14 17:37:17.000000000 +0100
++++ openjdk-ecj/jaxp/make/Makefile 2009-07-14 17:47:13.000000000 +0100
@@ -92,7 +92,7 @@
endif
@@ -292,8 +292,8 @@ diff -Nru openjdk-ecj.orig/jaxp/make/Mak
ifdef ALT_OUTPUTDIR
diff -Nru openjdk-ecj.orig/jaxws/make/build.properties openjdk-ecj/jaxws/make/build.properties
---- openjdk-ecj.orig/jaxws/make/build.properties 2009-07-01 13:42:16.000000000 +0100
-+++ openjdk-ecj/jaxws/make/build.properties 2009-07-01 13:52:45.000000000 +0100
+--- openjdk-ecj.orig/jaxws/make/build.properties 2009-07-14 17:37:18.000000000 +0100
++++ openjdk-ecj/jaxws/make/build.properties 2009-07-14 17:47:13.000000000 +0100
@@ -37,7 +37,7 @@
# set the following to -version to verify the versions of javac being used
javac.version.opt =
@@ -305,7 +305,7 @@ diff -Nru openjdk-ecj.orig/jaxws/make/bu
javac.memoryInitialSize = 128m
diff -Nru openjdk-ecj.orig/jaxws/make/build.xml openjdk-ecj/jaxws/make/build.xml
--- openjdk-ecj.orig/jaxws/make/build.xml 2009-06-30 14:24:56.000000000 +0100
-+++ openjdk-ecj/jaxws/make/build.xml 2009-07-01 13:52:45.000000000 +0100
++++ openjdk-ecj/jaxws/make/build.xml 2009-07-14 17:47:13.000000000 +0100
@@ -93,7 +93,10 @@
<mkdir dir="${build.toolclasses.dir}"/>
<javac srcdir="${make.tools.dir}/StripProperties"
@@ -327,8 +327,8 @@ diff -Nru openjdk-ecj.orig/jaxws/make/bu
<compilerarg line="${javac.version.opt}"/>
<compilerarg line="${javac.no.jdk.warnings}"/>
diff -Nru openjdk-ecj.orig/jaxws/make/Makefile openjdk-ecj/jaxws/make/Makefile
---- openjdk-ecj.orig/jaxws/make/Makefile 2009-07-01 13:42:16.000000000 +0100
-+++ openjdk-ecj/jaxws/make/Makefile 2009-07-01 13:52:45.000000000 +0100
+--- openjdk-ecj.orig/jaxws/make/Makefile 2009-07-14 17:37:17.000000000 +0100
++++ openjdk-ecj/jaxws/make/Makefile 2009-07-14 17:47:13.000000000 +0100
@@ -92,8 +92,8 @@
endif
@@ -342,7 +342,7 @@ diff -Nru openjdk-ecj.orig/jaxws/make/Ma
ifdef ALT_OUTPUTDIR
diff -Nru openjdk-ecj.orig/jdk/make/common/BuildToolJar.gmk openjdk-ecj/jdk/make/common/BuildToolJar.gmk
--- openjdk-ecj.orig/jdk/make/common/BuildToolJar.gmk 2009-03-30 17:23:03.000000000 +0100
-+++ openjdk-ecj/jdk/make/common/BuildToolJar.gmk 2009-07-01 13:52:45.000000000 +0100
++++ openjdk-ecj/jdk/make/common/BuildToolJar.gmk 2009-07-14 17:47:13.000000000 +0100
@@ -43,7 +43,8 @@
@$(prep-target)
@$(MKDIR) -p $(BUILDTOOLCLASSDIR)
@@ -354,57 +354,33 @@ diff -Nru openjdk-ecj.orig/jdk/make/comm
-C $(BUILDTOOLCLASSDIR) $(PKGDIR) \
$(BOOT_JAR_JFLAGS) || $(RM) $@
diff -Nru openjdk-ecj.orig/jdk/make/common/Release.gmk openjdk-ecj/jdk/make/common/Release.gmk
---- openjdk-ecj.orig/jdk/make/common/Release.gmk 2009-07-01 13:42:20.000000000 +0100
-+++ openjdk-ecj/jdk/make/common/Release.gmk 2009-07-01 13:52:45.000000000 +0100
-@@ -652,10 +652,23 @@
- $(RES_JAR_ARGLIST): $(RES_JAR_FILELIST)
- $(prep-target)
- $(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@
--$(RESOURCES_JAR): $(RES_JAR_ARGLIST) $(JAR_MANIFEST_FILE)
-+$(RESOURCES_JAR): \
-+ $(if $(JAR_KNOWS_ATFILE),$(RES_JAR_FILELIST),$(RES_JAR_ARGLIST)) \
-+ $(JAR_MANIFEST_FILE)
+--- openjdk-ecj.orig/jdk/make/common/Release.gmk 2009-07-14 17:37:19.000000000 +0100
++++ openjdk-ecj/jdk/make/common/Release.gmk 2009-07-14 17:54:01.000000000 +0100
+@@ -650,10 +650,21 @@
+ RESOURCES_JAR=$(ABS_TEMPDIR)/resources-orig.jar
+ $(RESOURCES_JAR): $(RES_JAR_FILELIST) $(JAR_MANIFEST_FILE)
$(prep-target)
+ifneq (,$(JAR_KNOWS_ATFILE))
-+ (cd $(CLASSBINDIR) && \
- $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
-- @$(RES_JAR_ARGLIST) $(BOOT_JAR_JFLAGS)
-+ $(JAR_JFLAGS) @$(RES_JAR_FILELIST))
+ $(CD) $(CLASSBINDIR) && \
+ $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
+ @$(RES_JAR_FILELIST) $(BOOT_JAR_JFLAGS)
+- @$(CD) $(CLASSBINDIR) && $(java-vm-cleanup)
++ @$(CD) $(CLASSBINDIR)
+else ifneq (,$(JAR_ACCEPTS_STDIN_LIST))
+ (cd $(CLASSBINDIR) && $(CAT) $(RES_JAR_FILELIST) | \
-+ $(BOOT_JAR_CMD) c0mf@ $(JAR_MANIFEST_FILE) $@ \
-+ $(JAR_JFLAGS))
-+else
-+ (cd $(CLASSBINDIR) && \
-+ $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
-+ $(JAR_JFLAGS) `cat $(RES_JAR_FILELIST)`)
-+endif
- @$(java-vm-cleanup)
-
- # Create jsse.jar containing SunJSSE implementation classes
-@@ -711,10 +724,18 @@
- $(RT_JAR_ARGLIST): $(RT_JAR_FILELIST)
- $(prep-target)
- $(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@
--$(RT_JAR): $(RT_JAR_ARGLIST) $(JAR_MANIFEST_FILE)
-+$(RT_JAR): $(if $(JAR_KNOWS_ATFILE),$(RT_JAR_FILELIST),$(RT_JAR_ARGLIST)) \
-+ $(JAR_MANIFEST_FILE)
- $(prep-target)
-+ifneq (,$(JAR_KNOWS_ATFILE))
-+ (cd $(CLASSBINDIR) && $(CAT) $(RT_JAR_FILELIST) | \
+ $(BOOT_JAR_CMD) c0mf@ $(JAR_MANIFEST_FILE) $@ \
+ $(BOOT_JAR_JFLAGS))
+else
+ (cd $(CLASSBINDIR) && \
- $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
-- @$(RT_JAR_ARGLIST) $(BOOT_JAR_JFLAGS)
-+ $(BOOT_JAR_JFLAGS) `$(CAT) $(RT_JAR_FILELIST)`)
++ $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
++ $(BOOT_JAR_JFLAGS) `cat $(RES_JAR_FILELIST)`)
+endif
- @$(java-vm-cleanup)
-
- # Meta-index construction to make core class loaders lazier
-@@ -945,19 +966,6 @@
- @$(java-vm-cleanup)
++ $(java-vm-cleanup)
+
+ # Create jsse.jar containing SunJSSE implementation classes
+ JSSE_JAR=$(ABS_TEMPDIR)/jsse-orig.jar
+@@ -944,19 +955,6 @@
+ @$(CD) $(CLASSBINDIR) && $(java-vm-cleanup)
$(CP) $(LIBDIR)/tools.jar $(JDK_IMAGE_DIR)/lib/tools.jar
@#
- @# lib/ct.sym
@@ -423,7 +399,7 @@ diff -Nru openjdk-ecj.orig/jdk/make/comm
@# CORBA supported orb.idl and ir.idl should be copied to lib
@#
$(CP) $(LIBDIR)/orb.idl $(JDK_IMAGE_DIR)/lib/orb.idl
-@@ -1034,16 +1042,6 @@
+@@ -1033,16 +1031,6 @@
$(CP) $(PLATFORM_SRC)/bin/java_md.h $(JDK_IMAGE_DIR)/src/launcher
$(CD) $(JDK_IMAGE_DIR)/src && $(ZIPEXE) -qr ../src.zip *
$(RM) -r $(JDK_IMAGE_DIR)/src
@@ -442,7 +418,7 @@ diff -Nru openjdk-ecj.orig/jdk/make/comm
endif # !windows
diff -Nru openjdk-ecj.orig/jdk/make/common/Rules.gmk openjdk-ecj/jdk/make/common/Rules.gmk
--- openjdk-ecj.orig/jdk/make/common/Rules.gmk 2009-03-30 17:23:03.000000000 +0100
-+++ openjdk-ecj/jdk/make/common/Rules.gmk 2009-07-01 13:52:45.000000000 +0100
++++ openjdk-ecj/jdk/make/common/Rules.gmk 2009-07-14 17:47:13.000000000 +0100
@@ -237,8 +237,9 @@
$(ECHO) "# Java sources to be compiled: (listed in file $<)"; \
$(CAT) $<.filtered; \
@@ -469,8 +445,8 @@ diff -Nru openjdk-ecj.orig/jdk/make/comm
@$(TOUCH) $@
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 2009-07-01 13:42:16.000000000 +0100
-+++ openjdk-ecj/jdk/make/common/shared/Defs-java.gmk 2009-07-01 13:52:45.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk 2009-07-14 17:37:18.000000000 +0100
++++ openjdk-ecj/jdk/make/common/shared/Defs-java.gmk 2009-07-14 17:47:13.000000000 +0100
@@ -136,33 +136,22 @@
JAVACFLAGS += $(OTHER_JAVACFLAGS)
@@ -507,8 +483,8 @@ diff -Nru openjdk-ecj.orig/jdk/make/comm
# Override of what javac to use (see deploy workspace)
diff -Nru openjdk-ecj.orig/jdk/make/java/nio/Makefile openjdk-ecj/jdk/make/java/nio/Makefile
---- openjdk-ecj.orig/jdk/make/java/nio/Makefile 2009-07-01 13:42:19.000000000 +0100
-+++ openjdk-ecj/jdk/make/java/nio/Makefile 2009-07-01 13:52:45.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/java/nio/Makefile 2009-07-14 17:37:18.000000000 +0100
++++ openjdk-ecj/jdk/make/java/nio/Makefile 2009-07-14 17:47:13.000000000 +0100
@@ -31,7 +31,7 @@
PACKAGE = java.nio
LIBRARY = nio
@@ -520,7 +496,7 @@ diff -Nru openjdk-ecj.orig/jdk/make/java
NIO_SRC = $(SHARE_SRC)/classes/java/nio
diff -Nru openjdk-ecj.orig/jdk/make/java/text/Makefile openjdk-ecj/jdk/make/java/text/Makefile
--- openjdk-ecj.orig/jdk/make/java/text/Makefile 2009-05-08 16:10:43.000000000 +0100
-+++ openjdk-ecj/jdk/make/java/text/Makefile 2009-07-01 13:52:45.000000000 +0100
++++ openjdk-ecj/jdk/make/java/text/Makefile 2009-07-14 17:47:13.000000000 +0100
@@ -81,8 +81,8 @@
-sourcepath $(TEXT_SRCDIR) \
$(TEXT_SOURCES)
@@ -534,7 +510,7 @@ diff -Nru openjdk-ecj.orig/jdk/make/java
@$(java-vm-cleanup)
diff -Nru openjdk-ecj.orig/jdk/make/Makefile openjdk-ecj/jdk/make/Makefile
--- openjdk-ecj.orig/jdk/make/Makefile 2009-05-08 16:10:43.000000000 +0100
-+++ openjdk-ecj/jdk/make/Makefile 2009-07-01 13:52:45.000000000 +0100
++++ openjdk-ecj/jdk/make/Makefile 2009-07-14 17:47:13.000000000 +0100
@@ -239,7 +239,7 @@
all build:: sanity-all post-sanity-all
@@ -546,7 +522,7 @@ diff -Nru openjdk-ecj.orig/jdk/make/Make
diff -Nru openjdk-ecj.orig/jdk/make/sun/awt/FILES_export_unix.gmk openjdk-ecj/jdk/make/sun/awt/FILES_export_unix.gmk
--- openjdk-ecj.orig/jdk/make/sun/awt/FILES_export_unix.gmk 2009-05-08 16:10:44.000000000 +0100
-+++ openjdk-ecj/jdk/make/sun/awt/FILES_export_unix.gmk 2009-07-01 13:52:45.000000000 +0100
++++ openjdk-ecj/jdk/make/sun/awt/FILES_export_unix.gmk 2009-07-14 17:47:13.000000000 +0100
@@ -189,3 +189,5 @@
java/awt/dnd/DnDConstants.java \
sun/awt/CausedFocusEvent.java
@@ -555,7 +531,7 @@ diff -Nru openjdk-ecj.orig/jdk/make/sun/
+ sun.java2d.opengl.OGLContext$$OGLContextCaps
diff -Nru openjdk-ecj.orig/jdk/make/sun/awt/Makefile openjdk-ecj/jdk/make/sun/awt/Makefile
--- openjdk-ecj.orig/jdk/make/sun/awt/Makefile 2009-05-08 16:10:44.000000000 +0100
-+++ openjdk-ecj/jdk/make/sun/awt/Makefile 2009-07-01 13:52:45.000000000 +0100
++++ openjdk-ecj/jdk/make/sun/awt/Makefile 2009-07-14 17:47:13.000000000 +0100
@@ -401,10 +401,9 @@
COMPILEFONTCONFIG_JARFILE = $(BUILDTOOLJARDIR)/compilefontconfig.jar
@@ -572,7 +548,7 @@ diff -Nru openjdk-ecj.orig/jdk/make/sun/
fontconfigs.clean :
diff -Nru openjdk-ecj.orig/jdk/make/sun/javazic/Makefile openjdk-ecj/jdk/make/sun/javazic/Makefile
--- openjdk-ecj.orig/jdk/make/sun/javazic/Makefile 2009-03-30 17:23:03.000000000 +0100
-+++ openjdk-ecj/jdk/make/sun/javazic/Makefile 2009-07-01 13:52:45.000000000 +0100
++++ openjdk-ecj/jdk/make/sun/javazic/Makefile 2009-07-14 17:47:13.000000000 +0100
@@ -62,7 +62,8 @@
$(WORKDIR)/$(MAPFILE): $(BUILDTOOLJARDIR)/javazic.jar $(TZFILES)
$(RM) -r $(@D)
@@ -585,7 +561,7 @@ diff -Nru openjdk-ecj.orig/jdk/make/sun/
$(INSTALLDIR)/$(MAPFILE): $(WORKDIR)/$(MAPFILE)
diff -Nru openjdk-ecj.orig/jdk/make/sun/text/Makefile openjdk-ecj/jdk/make/sun/text/Makefile
--- openjdk-ecj.orig/jdk/make/sun/text/Makefile 2009-03-30 17:23:03.000000000 +0100
-+++ openjdk-ecj/jdk/make/sun/text/Makefile 2009-07-01 13:52:45.000000000 +0100
++++ openjdk-ecj/jdk/make/sun/text/Makefile 2009-07-14 17:47:13.000000000 +0100
@@ -85,8 +85,9 @@
$(BOOT_JAVAC_CMD) -d $(TEXT_CLASSES) \
-sourcepath $(TEXT_SRCDIR) \
@@ -599,8 +575,8 @@ diff -Nru openjdk-ecj.orig/jdk/make/sun/
-spec $(UNICODEDATA)/UnicodeData.txt \
-language th
diff -Nru openjdk-ecj.orig/jdk/make/sun/xawt/Makefile openjdk-ecj/jdk/make/sun/xawt/Makefile
---- openjdk-ecj.orig/jdk/make/sun/xawt/Makefile 2009-07-01 13:42:21.000000000 +0100
-+++ openjdk-ecj/jdk/make/sun/xawt/Makefile 2009-07-01 13:52:45.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/sun/xawt/Makefile 2009-07-14 17:37:19.000000000 +0100
++++ openjdk-ecj/jdk/make/sun/xawt/Makefile 2009-07-14 17:47:13.000000000 +0100
@@ -294,11 +294,7 @@
TEMPDIR_CLASSES = $(TEMPDIR)/classes
@@ -638,8 +614,8 @@ diff -Nru openjdk-ecj.orig/jdk/make/sun/
done
$(TOUCH) $@
diff -Nru openjdk-ecj.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java
---- openjdk-ecj.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2009-07-01 13:41:38.000000000 +0100
-+++ openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2009-07-01 13:52:45.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2009-07-14 17:36:40.000000000 +0100
++++ openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2009-07-14 17:47:13.000000000 +0100
@@ -647,9 +647,6 @@
throws FileNotFoundException, IOException {
BufferedReader in = new BufferedReader(new FileReader(theTemplateFileName));
@@ -659,8 +635,8 @@ diff -Nru openjdk-ecj.orig/jdk/make/tool
if (plane == 0 && bLatin1 == false) {
genCaseMapTableDeclaration(result);
diff -Nru openjdk-ecj.orig/jdk/src/share/classes/java/lang/Double.java openjdk-ecj/jdk/src/share/classes/java/lang/Double.java
---- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Double.java 2009-07-01 13:41:25.000000000 +0100
-+++ openjdk-ecj/jdk/src/share/classes/java/lang/Double.java 2009-07-01 13:52:45.000000000 +0100
+--- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Double.java 2009-07-14 17:36:32.000000000 +0100
++++ openjdk-ecj/jdk/src/share/classes/java/lang/Double.java 2009-07-14 17:47:13.000000000 +0100
@@ -76,7 +76,7 @@
* {@code 0x1.fffffffffffffP+1023} and also equal to
* {@code Double.longBitsToDouble(0x7fefffffffffffffL)}.
@@ -689,8 +665,8 @@ diff -Nru openjdk-ecj.orig/jdk/src/share
/**
* Maximum exponent a finite {@code double} variable may have.
diff -Nru openjdk-ecj.orig/jdk/src/share/classes/java/lang/Float.java openjdk-ecj/jdk/src/share/classes/java/lang/Float.java
---- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Float.java 2009-07-01 13:41:26.000000000 +0100
-+++ openjdk-ecj/jdk/src/share/classes/java/lang/Float.java 2009-07-01 13:52:45.000000000 +0100
+--- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Float.java 2009-07-14 17:36:32.000000000 +0100
++++ openjdk-ecj/jdk/src/share/classes/java/lang/Float.java 2009-07-14 17:47:13.000000000 +0100
@@ -76,7 +76,7 @@
* {@code 0x1.fffffeP+127f} and also equal to
* {@code Float.intBitsToFloat(0x7f7fffff)}.
@@ -720,7 +696,7 @@ diff -Nru openjdk-ecj.orig/jdk/src/share
* Maximum exponent a finite {@code float} variable may have. It
diff -Nru openjdk-ecj.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h openjdk-ecj/jdk/src/share/native/sun/java2d/opengl/OGLContext.h
--- openjdk-ecj.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2009-03-30 17:23:07.000000000 +0100
-+++ openjdk-ecj/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2009-07-01 13:52:45.000000000 +0100
++++ openjdk-ecj/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2009-07-14 17:47:13.000000000 +0100
@@ -27,6 +27,7 @@
#define OGLContext_h_Included
@@ -786,8 +762,8 @@ diff -Nru openjdk-ecj.orig/jdk/src/share
/**
* Evaluates to true if the given capability bitmask is present for the
diff -Nru openjdk-ecj.orig/langtools/make/build.properties openjdk-ecj/langtools/make/build.properties
---- openjdk-ecj.orig/langtools/make/build.properties 2009-07-01 13:54:20.000000000 +0100
-+++ openjdk-ecj/langtools/make/build.properties 2009-07-01 13:54:36.000000000 +0100
+--- openjdk-ecj.orig/langtools/make/build.properties 2009-06-30 14:25:18.000000000 +0100
++++ openjdk-ecj/langtools/make/build.properties 2009-07-14 17:47:13.000000000 +0100
@@ -32,8 +32,8 @@
# boot.java.home = /opt/jdk/1.5.0
boot.java = ${boot.java.home}/bin/java
@@ -801,7 +777,7 @@ diff -Nru openjdk-ecj.orig/langtools/mak
# for example, for testing. If you're building a complete JDK, specify that.
diff -Nru openjdk-ecj.orig/langtools/make/build.xml openjdk-ecj/langtools/make/build.xml
--- openjdk-ecj.orig/langtools/make/build.xml 2009-06-30 14:25:18.000000000 +0100
-+++ openjdk-ecj/langtools/make/build.xml 2009-07-01 13:53:47.000000000 +0100
++++ openjdk-ecj/langtools/make/build.xml 2009-07-14 17:47:13.000000000 +0100
@@ -516,6 +516,7 @@
includeAntRuntime="no"
source="@{javac.source}"
@@ -819,8 +795,8 @@ diff -Nru openjdk-ecj.orig/langtools/mak
<compilerarg value="-Xbootclasspath/p:@{classes.dir}"/>
<compilerarg line="${javac.no.jdk.warnings}"/>
diff -Nru openjdk-ecj.orig/langtools/make/Makefile openjdk-ecj/langtools/make/Makefile
---- openjdk-ecj.orig/langtools/make/Makefile 2009-07-01 13:42:16.000000000 +0100
-+++ openjdk-ecj/langtools/make/Makefile 2009-07-01 13:52:45.000000000 +0100
+--- openjdk-ecj.orig/langtools/make/Makefile 2009-07-14 17:37:17.000000000 +0100
++++ openjdk-ecj/langtools/make/Makefile 2009-07-14 17:47:13.000000000 +0100
@@ -130,7 +130,7 @@
ifdef ALT_BOOTDIR
@@ -831,8 +807,8 @@ diff -Nru openjdk-ecj.orig/langtools/mak
ifdef ALT_OUTPUTDIR
diff -Nru openjdk-ecj.orig/make/jdk-rules.gmk openjdk-ecj/make/jdk-rules.gmk
---- openjdk-ecj.orig/make/jdk-rules.gmk 2009-07-01 13:42:16.000000000 +0100
-+++ openjdk-ecj/make/jdk-rules.gmk 2009-07-01 13:52:45.000000000 +0100
+--- openjdk-ecj.orig/make/jdk-rules.gmk 2009-07-14 17:37:18.000000000 +0100
++++ openjdk-ecj/make/jdk-rules.gmk 2009-07-14 17:47:13.000000000 +0100
@@ -58,7 +58,7 @@
endif
diff -r e944184d6eda -r e2ff1b52131d patches/icedtea-linker-libs-order.patch
--- a/patches/icedtea-linker-libs-order.patch Thu Jul 09 19:52:10 2009 +0100
More information about the distro-pkg-dev
mailing list