changeset in /hg/icedtea: Bump to b46.
Andrew John Hughes
ahughes at redhat.com
Tue Feb 10 13:09:44 PST 2009
changeset fd8112e82992 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=fd8112e82992
description:
Bump to b46.
2009-02-10 Andrew John Hughes <ahughes at redhat.com>
Bump to b46.
* patches/icedtea-directaudio-close-trick.patch,
* patches/icedtea-enum-bug-181.patch,
* patches/icedtea-jsoundhs.patch,
* patches/icedtea-sound.patch:
Applied upstream.
* HACKING,
* Makefile.am: Updated.
* patches/ecj/icedtea.patch: Recreated due to
S6795030.
* patches/icedtea-copy-plugs.patch: Recreated
due to S6702956.
diffstat:
9 files changed, 101 insertions(+), 1070 deletions(-)
ChangeLog | 15
HACKING | 5
Makefile.am | 10
patches/ecj/icedtea.patch | 149 ++---
patches/icedtea-copy-plugs.patch | 22
patches/icedtea-directaudio-close-trick.patch | 193 ------
patches/icedtea-enum-bug-181.patch | 11
patches/icedtea-jsoundhs.patch | 73 --
patches/icedtea-sound.patch | 693 -------------------------
diffs (truncated from 1546 to 500 lines):
diff -r 5a2104fb2256 -r fd8112e82992 ChangeLog
--- a/ChangeLog Wed Feb 04 11:49:31 2009 +0000
+++ b/ChangeLog Tue Feb 10 21:09:31 2009 +0000
@@ -1,3 +1,18 @@ 2009-02-03 Andrew John Hughes <ahughes
+2009-02-10 Andrew John Hughes <ahughes at redhat.com>
+
+ Bump to b46.
+ * patches/icedtea-directaudio-close-trick.patch,
+ * patches/icedtea-enum-bug-181.patch,
+ * patches/icedtea-jsoundhs.patch,
+ * patches/icedtea-sound.patch:
+ Applied upstream.
+ * HACKING,
+ * Makefile.am: Updated.
+ * patches/ecj/icedtea.patch: Recreated due to
+ S6795030.
+ * patches/icedtea-copy-plugs.patch: Recreated
+ due to S6702956.
+
2009-02-03 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
diff -r 5a2104fb2256 -r fd8112e82992 HACKING
--- a/HACKING Wed Feb 04 11:49:31 2009 +0000
+++ b/HACKING Tue Feb 10 21:09:31 2009 +0000
@@ -24,7 +24,6 @@ The following patches are currently appl
* icedtea-core-build.patch: Add support for building IcedTea core VM.
* icedtea-debuginfo.patch: Add -g option to build to generate debugging information.
* icedtea-demos.patch: Fix building of JVMTI demo.
-* icedtea-enum-bug-181.patch: Fixes class type check (PR181/S6736248)
* icedtea-float-double-trailing-zeros.patch: Remove trailing zeros from Double/Float (PR29/30)
* icedtea-fonts.patch: Add Fedora fontconfig.
* icedtea-gcc-suffix.patch: Append $(GCC_SUFFIX) to end of 'gcc' binary name.
@@ -86,6 +85,7 @@ The following patches are only applied t
* icedtea-corba.patch: Adds additional files to org.omg.CORBA Makefile.
* icedtea-display-mode-changer.patch: Add extra test class. (applied in OpenJDK7 b43)
+* icedtea-enum-bug-181.patch: Fixes class type check (PR181/S6736248)
* icedtea-gcc-4.3.patch: Fix code to compile with GCC 4.3 and turn off -Werror.
* icedtea-generated.patch: Force use of /bin/bash.
* icedtea-nomotif.patch: Remove sanity and GrabShell.h dependency on Motif/Lesstif library.
@@ -105,15 +105,12 @@ The following patches are only applied t
* icedtea-constructor-properties.patch: Explicitly cast to ConstructorProperties
as getAnnotation is broken in libgcj 4.3.
-* icedtea-jsoundhs.patch: Remove attempted build of proprietary jsoundhs library.
* icedtea-mbeanintrospector.patch: Explicitly cast to Description as getAnnotation
is broken in libgcj 4.3.
* icedtea-override.patch: Remove @Override annotation in
javax.management.AttributeValueExp (unsupported by ecj < 3.4).
* icedtea-snmp.patch: Remove proprietary SNMP support hooks.
* icedtea-sound.patch: Remove proprietary MIDI support hooks.
-* icedtea-fortify-source.patch: Fix build failures with -D_FORTIFY_SOURCE=2.
-* icedtea-format-warnings.patch: Fix build failures with -Wformat=1.
The following patches are only applied to the icedtea-ecj bootstrap tree:
diff -r 5a2104fb2256 -r fd8112e82992 Makefile.am
--- a/Makefile.am Wed Feb 04 11:49:31 2009 +0000
+++ b/Makefile.am Tue Feb 10 21:09:31 2009 +0000
@@ -1,6 +1,6 @@ OPENJDK_DATE = 29_jan_2009
-OPENJDK_DATE = 29_jan_2009
-OPENJDK_MD5SUM = 0d6ae1ed77b470c9665d069b34a1bc88
-OPENJDK_VERSION = b45
+OPENJDK_DATE = 05_feb_2009
+OPENJDK_MD5SUM = d5f92fec2f645d44437ab90e1dd2dbaf
+OPENJDK_VERSION = b46
CACAO_VERSION = 0.99.3
CACAO_MD5SUM = 80de3ad344c1a20c086ec5f1390bd1b8
@@ -1845,7 +1845,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-uname.patch \
patches/icedtea-ia64-fdlibm.patch \
patches/icedtea-fonts.patch \
- patches/icedtea-directaudio-close-trick.patch \
patches/hotspot/$(HSBUILD)/icedtea-sparc-ptracefix.patch \
patches/hotspot/$(HSBUILD)/icedtea-sparc-trapsfix.patch \
patches/icedtea-override-redirect-metacity.patch \
@@ -1854,13 +1853,11 @@ ICEDTEA_PATCHES = \
patches/hotspot/$(HSBUILD)/icedtea-shark-build.patch \
patches/icedtea-toolkit.patch \
patches/icedtea-security-updates.patch \
- patches/icedtea-jsoundhs.patch \
patches/icedtea-jdk-docs-target.patch \
patches/icedtea-mbeanintrospector.patch \
patches/icedtea-hotspot-gcc-pr36917.patch \
patches/icedtea-alpha-fixes.patch \
patches/icedtea-alt-jar.patch \
- patches/icedtea-enum-bug-181.patch \
patches/icedtea-jdk-use-ssize_t.patch \
patches/hotspot/$(HSBUILD)/icedtea-use-idx_t.patch \
patches/hotspot/$(HSBUILD)/icedtea-params-cast-size_t.patch \
@@ -1876,7 +1873,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-xjc.patch \
patches/icedtea-renderer-crossing.patch \
patches/icedtea-snmp.patch \
- patches/icedtea-sound.patch \
patches/icedtea-tests-jdk.patch \
patches/icedtea-stroker-finish.patch \
patches/icedtea-alsa-default-device.patch \
diff -r 5a2104fb2256 -r fd8112e82992 patches/ecj/icedtea.patch
--- a/patches/ecj/icedtea.patch Wed Feb 04 11:49:31 2009 +0000
+++ b/patches/ecj/icedtea.patch Tue Feb 10 21:09:31 2009 +0000
@@ -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 2008-10-09 08:41:14.000000000 +0100
-+++ openjdk-ecj/corba/make/com/sun/corba/se/Makefile 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/corba/make/com/sun/corba/se/Makefile 2009-02-05 08:40:51.000000000 +0000
++++ openjdk-ecj/corba/make/com/sun/corba/se/Makefile 2009-02-10 19:24:54.000000000 +0000
@@ -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 2008-10-24 13:32:48.000000000 +0100
++++ openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile 2009-02-10 19:24:54.000000000 +0000
@@ -0,0 +1,38 @@
+#
+# Copyright 2001-2005 Sun Microsystems, Inc. All Rights Reserved.
@@ -53,8 +53,8 @@ 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 2008-10-09 08:41:14.000000000 +0100
-+++ openjdk-ecj/corba/make/common/Defs.gmk 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/corba/make/common/Defs.gmk 2009-02-05 08:40:51.000000000 +0000
++++ openjdk-ecj/corba/make/common/Defs.gmk 2009-02-10 19:24:54.000000000 +0000
@@ -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 2008-10-24 10:16:06.000000000 +0100
-+++ openjdk-ecj/corba/make/common/Defs-linux.gmk 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/corba/make/common/Defs-linux.gmk 2009-02-10 18:12:00.000000000 +0000
++++ openjdk-ecj/corba/make/common/Defs-linux.gmk 2009-02-10 19:24:54.000000000 +0000
@@ -276,7 +276,7 @@
fi; \
done)
@@ -100,8 +100,8 @@ 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 2008-10-09 08:41:14.000000000 +0100
-+++ openjdk-ecj/corba/make/common/Rules.gmk 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/corba/make/common/Rules.gmk 2009-02-05 08:40:51.000000000 +0000
++++ openjdk-ecj/corba/make/common/Rules.gmk 2009-02-10 19:24:54.000000000 +0000
@@ -197,8 +197,10 @@
$(ECHO) "# Java sources to be compiled: (listed in file $(JAVA_SOURCE_LIST))"; \
$(CAT) $(JAVA_SOURCE_LIST); \
@@ -116,8 +116,8 @@ diff -Nru openjdk-ecj.orig/corba/make/co
@$(java-vm-cleanup)
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-24 10:16:06.000000000 +0100
-+++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk 2009-02-10 18:12:00.000000000 +0000
++++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk 2009-02-10 19:24:54.000000000 +0000
@@ -110,31 +110,13 @@
JAVACFLAGS += $(OTHER_JAVACFLAGS)
@@ -155,8 +155,8 @@ diff -Nru openjdk-ecj.orig/corba/make/co
# Override of what javac to use (see deploy workspace)
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 2008-10-09 08:41:14.000000000 +0100
-+++ openjdk-ecj/corba/make/org/omg/sources/Makefile 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/corba/make/org/omg/sources/Makefile 2009-02-05 08:40:51.000000000 +0000
++++ openjdk-ecj/corba/make/org/omg/sources/Makefile 2009-02-10 19:24:54.000000000 +0000
@@ -93,8 +93,6 @@
POAHELHOLFILES = $(POA_GENERATED_HELP_HOL_java:%=$(GENSRCDIR)/%)
@@ -234,8 +234,8 @@ diff -Nru openjdk-ecj.orig/corba/make/or
pi.compile: $(PIGENERATEDFILES)
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 2008-10-24 10:16:05.000000000 +0100
-+++ openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/corba/make/sun/rmi/corbalogsources/Makefile 2009-02-10 18:11:57.000000000 +0000
++++ openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile 2009-02-10 19:24:54.000000000 +0000
@@ -172,7 +172,6 @@
ACTIVATIONFILES = $(com_sun_corba_se_spi_activation_java:%=$(GENSRCDIR)/%)
@@ -253,8 +253,8 @@ diff -Nru openjdk-ecj.orig/corba/make/su
portableactivation.idl.compile: $(PORTABLEACTIVATIONFILES)
diff -Nru openjdk-ecj.orig/jaxp/make/build.xml openjdk-ecj/jaxp/make/build.xml
---- openjdk-ecj.orig/jaxp/make/build.xml 2008-10-24 10:16:06.000000000 +0100
-+++ openjdk-ecj/jaxp/make/build.xml 2008-10-24 13:33:43.000000000 +0100
+--- openjdk-ecj.orig/jaxp/make/build.xml 2009-02-10 18:12:00.000000000 +0000
++++ openjdk-ecj/jaxp/make/build.xml 2009-02-10 19:24:54.000000000 +0000
@@ -71,7 +71,10 @@
<mkdir dir="${build.toolclasses.dir}"/>
<javac srcdir="${make.tools.dir}/StripProperties"
@@ -277,8 +277,8 @@ diff -Nru openjdk-ecj.orig/jaxp/make/bui
<compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/>
<compilerarg line="${javac.version.opt}"/>
diff -Nru openjdk-ecj.orig/jaxp/make/Makefile openjdk-ecj/jaxp/make/Makefile
---- openjdk-ecj.orig/jaxp/make/Makefile 2008-10-24 10:16:06.000000000 +0100
-+++ openjdk-ecj/jaxp/make/Makefile 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/jaxp/make/Makefile 2009-02-10 18:12:00.000000000 +0000
++++ openjdk-ecj/jaxp/make/Makefile 2009-02-10 19:24:54.000000000 +0000
@@ -75,7 +75,7 @@
endif
@@ -289,8 +289,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 2008-10-24 10:16:06.000000000 +0100
-+++ openjdk-ecj/jaxws/make/build.properties 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/jaxws/make/build.properties 2009-02-10 18:12:00.000000000 +0000
++++ openjdk-ecj/jaxws/make/build.properties 2009-02-10 19:24:54.000000000 +0000
@@ -37,7 +37,7 @@
# set the following to -version to verify the versions of javac being used
javac.version.opt =
@@ -301,8 +301,8 @@ diff -Nru openjdk-ecj.orig/jaxws/make/bu
# JVM memory size
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 2008-10-24 10:16:06.000000000 +0100
-+++ openjdk-ecj/jaxws/make/build.xml 2008-10-24 13:34:37.000000000 +0100
+--- openjdk-ecj.orig/jaxws/make/build.xml 2009-02-10 18:12:00.000000000 +0000
++++ openjdk-ecj/jaxws/make/build.xml 2009-02-10 19:24:54.000000000 +0000
@@ -84,7 +84,10 @@
<mkdir dir="${build.toolclasses.dir}"/>
<javac srcdir="${make.tools.dir}/StripProperties"
@@ -333,8 +333,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 2008-10-24 10:16:06.000000000 +0100
-+++ openjdk-ecj/jaxws/make/Makefile 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/jaxws/make/Makefile 2009-02-10 18:12:00.000000000 +0000
++++ openjdk-ecj/jaxws/make/Makefile 2009-02-10 19:24:54.000000000 +0000
@@ -75,8 +75,8 @@
endif
@@ -347,8 +347,8 @@ 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 2008-10-09 08:45:42.000000000 +0100
-+++ openjdk-ecj/jdk/make/common/BuildToolJar.gmk 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/common/BuildToolJar.gmk 2009-02-05 08:44:12.000000000 +0000
++++ openjdk-ecj/jdk/make/common/BuildToolJar.gmk 2009-02-10 19:24:54.000000000 +0000
@@ -43,7 +43,8 @@
@$(prep-target)
@$(MKDIR) -p $(BUILDTOOLCLASSDIR)
@@ -360,8 +360,8 @@ 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 2008-10-24 10:16:06.000000000 +0100
-+++ openjdk-ecj/jdk/make/common/Release.gmk 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/common/Release.gmk 2009-02-10 18:12:01.000000000 +0000
++++ openjdk-ecj/jdk/make/common/Release.gmk 2009-02-10 19:24:54.000000000 +0000
@@ -651,10 +651,23 @@
$(RES_JAR_ARGLIST): $(RES_JAR_FILELIST)
$(prep-target)
@@ -409,7 +409,7 @@ diff -Nru openjdk-ecj.orig/jdk/make/comm
@$(java-vm-cleanup)
# Meta-index construction to make core class loaders lazier
-@@ -951,19 +972,6 @@
+@@ -944,19 +965,6 @@
@$(java-vm-cleanup)
$(CP) $(LIBDIR)/tools.jar $(JDK_IMAGE_DIR)/lib/tools.jar
@#
@@ -429,7 +429,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
-@@ -1040,16 +1048,6 @@
+@@ -1033,16 +1041,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
@@ -447,8 +447,8 @@ diff -Nru openjdk-ecj.orig/jdk/make/comm
$(call copy-man-pages,$(JDK_IMAGE_DIR),$(JDK_MAN_PAGES))
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 2008-10-09 08:45:42.000000000 +0100
-+++ openjdk-ecj/jdk/make/common/Rules.gmk 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/common/Rules.gmk 2009-02-05 08:44:12.000000000 +0000
++++ openjdk-ecj/jdk/make/common/Rules.gmk 2009-02-10 19:24:54.000000000 +0000
@@ -237,8 +237,9 @@
$(ECHO) "# Java sources to be compiled: (listed in file $<)"; \
$(CAT) $<.filtered; \
@@ -475,8 +475,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 2008-10-24 10:16:06.000000000 +0100
-+++ openjdk-ecj/jdk/make/common/shared/Defs-java.gmk 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk 2009-02-10 18:12:00.000000000 +0000
++++ openjdk-ecj/jdk/make/common/shared/Defs-java.gmk 2009-02-10 19:24:54.000000000 +0000
@@ -121,30 +121,19 @@
JAVACFLAGS += $(OTHER_JAVACFLAGS)
@@ -510,8 +510,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 2008-10-09 08:45:42.000000000 +0100
-+++ openjdk-ecj/jdk/make/java/nio/Makefile 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/java/nio/Makefile 2009-02-05 08:44:13.000000000 +0000
++++ openjdk-ecj/jdk/make/java/nio/Makefile 2009-02-10 19:24:54.000000000 +0000
@@ -31,7 +31,7 @@
PACKAGE = java.nio
LIBRARY = nio
@@ -522,8 +522,8 @@ 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 2008-10-09 08:45:42.000000000 +0100
-+++ openjdk-ecj/jdk/make/java/text/Makefile 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/java/text/Makefile 2009-02-05 08:44:13.000000000 +0000
++++ openjdk-ecj/jdk/make/java/text/Makefile 2009-02-10 19:24:54.000000000 +0000
@@ -80,8 +80,8 @@
-sourcepath $(TEXT_SRCDIR) \
$(TEXT_SOURCES)
@@ -536,8 +536,8 @@ diff -Nru openjdk-ecj.orig/jdk/make/java
-spec $(UNICODEDATA)/UnicodeData.txt
@$(java-vm-cleanup)
diff -Nru openjdk-ecj.orig/jdk/make/Makefile openjdk-ecj/jdk/make/Makefile
---- openjdk-ecj.orig/jdk/make/Makefile 2008-10-09 08:45:41.000000000 +0100
-+++ openjdk-ecj/jdk/make/Makefile 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/Makefile 2009-02-05 08:44:12.000000000 +0000
++++ openjdk-ecj/jdk/make/Makefile 2009-02-10 19:24:54.000000000 +0000
@@ -239,7 +239,7 @@
all build:: sanity-all post-sanity-all
@@ -548,8 +548,8 @@ diff -Nru openjdk-ecj.orig/jdk/make/Make
$(SUBDIRS-loop)
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 2008-10-09 08:45:43.000000000 +0100
-+++ openjdk-ecj/jdk/make/sun/awt/FILES_export_unix.gmk 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/sun/awt/FILES_export_unix.gmk 2009-02-05 08:44:14.000000000 +0000
++++ openjdk-ecj/jdk/make/sun/awt/FILES_export_unix.gmk 2009-02-10 19:24:54.000000000 +0000
@@ -188,3 +188,5 @@
java/awt/dnd/DnDConstants.java \
sun/awt/CausedFocusEvent.java
@@ -557,8 +557,8 @@ diff -Nru openjdk-ecj.orig/jdk/make/sun/
+EXPORTED_inner = \
+ 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 2008-10-09 08:45:43.000000000 +0100
-+++ openjdk-ecj/jdk/make/sun/awt/Makefile 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/sun/awt/Makefile 2009-02-05 08:44:14.000000000 +0000
++++ openjdk-ecj/jdk/make/sun/awt/Makefile 2009-02-10 19:24:54.000000000 +0000
@@ -395,10 +395,9 @@
COMPILEFONTCONFIG_JARFILE = $(BUILDTOOLJARDIR)/compilefontconfig.jar
@@ -574,8 +574,8 @@ 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 2008-10-09 08:45:43.000000000 +0100
-+++ openjdk-ecj/jdk/make/sun/javazic/Makefile 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/sun/javazic/Makefile 2009-02-05 08:44:14.000000000 +0000
++++ openjdk-ecj/jdk/make/sun/javazic/Makefile 2009-02-10 19:24:54.000000000 +0000
@@ -62,7 +62,8 @@
$(WORKDIR)/$(MAPFILE): $(BUILDTOOLJARDIR)/javazic.jar $(TZFILES)
$(RM) -r $(@D)
@@ -587,8 +587,8 @@ 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 2008-10-09 08:45:44.000000000 +0100
-+++ openjdk-ecj/jdk/make/sun/text/Makefile 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/sun/text/Makefile 2009-02-05 08:44:14.000000000 +0000
++++ openjdk-ecj/jdk/make/sun/text/Makefile 2009-02-10 19:24:54.000000000 +0000
@@ -85,8 +85,9 @@
$(BOOT_JAVAC_CMD) -d $(TEXT_CLASSES) \
-sourcepath $(TEXT_SRCDIR) \
@@ -602,8 +602,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 2008-10-09 08:45:44.000000000 +0100
-+++ openjdk-ecj/jdk/make/sun/xawt/Makefile 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/sun/xawt/Makefile 2009-02-10 18:12:01.000000000 +0000
++++ openjdk-ecj/jdk/make/sun/xawt/Makefile 2009-02-10 19:24:54.000000000 +0000
@@ -276,11 +276,7 @@
TEMPDIR_CLASSES = $(TEMPDIR)/classes
@@ -641,8 +641,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 2008-10-24 10:16:45.000000000 +0100
-+++ openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2009-02-10 18:11:22.000000000 +0000
++++ openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2009-02-10 19:24:54.000000000 +0000
@@ -647,9 +647,6 @@
throws FileNotFoundException, IOException {
BufferedReader in = new BufferedReader(new FileReader(theTemplateFileName));
@@ -662,8 +662,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 2008-10-24 10:16:33.000000000 +0100
-+++ openjdk-ecj/jdk/src/share/classes/java/lang/Double.java 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Double.java 2009-02-10 18:11:12.000000000 +0000
++++ openjdk-ecj/jdk/src/share/classes/java/lang/Double.java 2009-02-10 19:24:54.000000000 +0000
@@ -76,7 +76,7 @@
* {@code 0x1.fffffffffffffP+1023} and also equal to
* {@code Double.longBitsToDouble(0x7fefffffffffffffL)}.
@@ -692,8 +692,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 2008-10-24 10:16:33.000000000 +0100
-+++ openjdk-ecj/jdk/src/share/classes/java/lang/Float.java 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Float.java 2009-02-10 18:11:12.000000000 +0000
++++ openjdk-ecj/jdk/src/share/classes/java/lang/Float.java 2009-02-10 19:24:54.000000000 +0000
@@ -76,7 +76,7 @@
* {@code 0x1.fffffeP+127f} and also equal to
* {@code Float.intBitsToFloat(0x7f7fffff)}.
@@ -722,8 +722,8 @@ 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 2008-10-09 08:46:24.000000000 +0100
-+++ openjdk-ecj/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2008-10-24 13:32:48.000000000 +0100
+--- openjdk-ecj.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2009-02-05 08:44:52.000000000 +0000
++++ openjdk-ecj/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2009-02-10 19:24:54.000000000 +0000
@@ -27,6 +27,7 @@
#define OGLContext_h_Included
@@ -789,49 +789,44 @@ 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.xml openjdk-ecj/langtools/make/build.xml
---- openjdk-ecj.orig/langtools/make/build.xml 2008-10-09 08:47:11.000000000 +0100
-+++ openjdk-ecj/langtools/make/build.xml 2008-10-24 13:32:48.000000000 +0100
-@@ -498,7 +498,10 @@
+--- openjdk-ecj.orig/langtools/make/build.xml 2009-02-05 08:45:36.000000000 +0000
++++ openjdk-ecj/langtools/make/build.xml 2009-02-10 19:56:00.000000000 +0000
+@@ -502,7 +502,9 @@
includes="@{includes}"
sourcepath=""
includeAntRuntime="no"
- target="@{javac.target}">
+ target="@{javac.target}"
-+ executable="${javac.executable}"
+ source="1.5">
+ <compilerarg line="-bootclasspath @{classes.dir}:../../generated:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar"/>
<compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
<compilerarg line="${javac.version.opt}"/>
<compilerarg line="-Xlint"/>
-@@ -512,7 +515,10 @@
+@@ -517,7 +519,9 @@
includeAntRuntime="no"
target="@{javac.target}"
debug="${javac.debug}"
- debuglevel="${javac.debuglevel}">
-+ executable="${javac.executable}"
+ debuglevel="${javac.debuglevel}"
+ source="1.5">
+ <compilerarg line="-bootclasspath @{classes.dir}:../../generated:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar"/>
<compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
<compilerarg value="-Xbootclasspath/p:@{classes.dir}"/>
<compilerarg line="${javac.no.jdk.warnings}"/>
-@@ -563,8 +569,11 @@
- <target name="-def-pcompile">
- <mkdir dir="${build.toolclasses.dir}"/>
- <javac srcdir="${make.tools.dir}/CompileProperties"
-+ fork="true"
+@@ -571,7 +575,8 @@
+ executable="${boot.java.home}/bin/javac"
+ srcdir="${make.tools.dir}/CompileProperties"
destdir="${build.toolclasses.dir}/"
- classpath="${ant.home}/lib/ant.jar"/>
+ classpath="${ant.home}/lib/ant.jar"
-+ executable="${javac.executable}"
-+ source="1.5"/>
++ source="1.5" />
<taskdef name="pcompile"
classname="CompilePropertiesTask"
classpath="${build.toolclasses.dir}/"/>
diff -Nru openjdk-ecj.orig/langtools/make/Makefile openjdk-ecj/langtools/make/Makefile
---- openjdk-ecj.orig/langtools/make/Makefile 2008-10-24 10:16:06.000000000 +0100
-+++ openjdk-ecj/langtools/make/Makefile 2008-10-24 13:32:48.000000000 +0100
-@@ -108,7 +108,7 @@
+--- openjdk-ecj.orig/langtools/make/Makefile 2009-02-10 18:12:00.000000000 +0000
++++ openjdk-ecj/langtools/make/Makefile 2009-02-10 19:24:54.000000000 +0000
+@@ -112,7 +112,7 @@
ifdef ALT_BOOTDIR
ANT_OPTIONS += -Dboot.java.home=$(ALT_BOOTDIR)
@@ -841,8 +836,8 @@ diff -Nru openjdk-ecj.orig/langtools/mak
ifdef ALT_OUTPUTDIR
More information about the distro-pkg-dev
mailing list