changeset in /hg/icedtea: Bump to b60.
Andrew John Hughes
ahughes at redhat.com
Tue Jun 16 03:03:28 PDT 2009
changeset 8e5de53d67cd in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8e5de53d67cd
description:
Bump to b60.
2009-06-11 Andrew John Hughes <ahughes at redhat.com>
* patches/hotspot/default/icedtea-debuginfo.patch,
* patches/icedtea-debuginfo.patch,
* patches/icedtea-javac-debuginfo.patch:
Removed, replaced by aph's upstream patches.
* Makefile.am:
Bump to b60, turn on DEBUG_CLASSFILES and DEBUG_BINARIES.
* patches/ecj/icedtea.patch,
* patches/hotspot/default/icedtea-zero-build.patch:
Rerolled.
diffstat:
7 files changed, 116 insertions(+), 282 deletions(-)
ChangeLog | 12 ++
Makefile.am | 45 ++++---
patches/ecj/icedtea.patch | 126 +++++++++++-----------
patches/hotspot/default/icedtea-debuginfo.patch | 15 --
patches/hotspot/default/icedtea-zero-build.patch | 34 ++---
patches/icedtea-debuginfo.patch | 64 -----------
patches/icedtea-javac-debuginfo.patch | 102 -----------------
diffs (truncated from 756 to 500 lines):
diff -r f95ae75a68c6 -r 8e5de53d67cd ChangeLog
--- a/ChangeLog Thu Jun 11 22:40:38 2009 +0100
+++ b/ChangeLog Tue Jun 16 11:04:53 2009 +0100
@@ -1,3 +1,15 @@ 2009-06-11 Andrew John Hughes <ahughes
+2009-06-11 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/hotspot/default/icedtea-debuginfo.patch,
+ * patches/icedtea-debuginfo.patch,
+ * patches/icedtea-javac-debuginfo.patch:
+ Removed, replaced by aph's upstream patches.
+ * Makefile.am:
+ Bump to b60, turn on DEBUG_CLASSFILES and DEBUG_BINARIES.
+ * patches/ecj/icedtea.patch,
+ * patches/hotspot/default/icedtea-zero-build.patch:
+ Rerolled.
+
2009-06-11 Andrew John Hughes <ahughes at redhat.com>
* configure.ac:
diff -r f95ae75a68c6 -r 8e5de53d67cd Makefile.am
--- a/Makefile.am Thu Jun 11 22:40:38 2009 +0100
+++ b/Makefile.am Tue Jun 16 11:04:53 2009 +0100
@@ -1,20 +1,20 @@ OPENJDK_VERSION = b59
-OPENJDK_VERSION = b59
-
-OPENJDK_CHANGESET = 0d76c4da605f
-CORBA_CHANGESET = e9ba2b962ddf
-JAXP_CHANGESET = 748976d69503
-JAXWS_CHANGESET = faac46e2e60f
-JDK_CHANGESET = 3d024b86523a
-LANGTOOLS_CHANGESET = 0f653be1a42f
-HOTSPOT_CHANGESET = aa0c48844632
-
-OPENJDK_MD5SUM = 51beb96e5d6bc4b875b4316f4ef724d7
-CORBA_MD5SUM = 13b64a402845a469cae31e04ffc5ee80
-JAXP_MD5SUM = 18c922319545d7e907a2d6cbb265865d
-JAXWS_MD5SUM = b2c0a779e349f82427a78485ef53321b
-JDK_MD5SUM = 16f6bbc35c99de1996b545b6b500f668
-LANGTOOLS_MD5SUM = ccad721f71ab49a61bbf684039b4d55d
-HOTSPOT_MD5SUM = c40c25a481a1c33ac15a89812a0b9f8c
+OPENJDK_VERSION = b60
+
+OPENJDK_CHANGESET = 472c21584cfd
+CORBA_CHANGESET = e906b16a12a9
+JAXP_CHANGESET = f1ac756616ea
+JAXWS_CHANGESET = 55ffcbca5f46
+JDK_CHANGESET = 1a01c90431a7
+LANGTOOLS_CHANGESET = 522520757dd3
+HOTSPOT_CHANGESET = 86092459c54d
+
+OPENJDK_MD5SUM = 9f5e15067cf5207760a83cea8ba41da8
+CORBA_MD5SUM = 7f00e0b5d16046d116cd53c9f43c7122
+JAXP_MD5SUM = 2de0ec54014eb7f25c811e40fc2e3e3f
+JAXWS_MD5SUM = 9c0131755eefaa929ca8e47abe21cc58
+JDK_MD5SUM = 1fd637880521f3e2c274a1db8bfed89b
+LANGTOOLS_MD5SUM = e7c0ac7a9d67d361cc64fc15312d4a85
+HOTSPOT_MD5SUM = 18c922319545d7e907a2d6cbb265865d
CACAO_VERSION = 0.99.4
CACAO_MD5SUM = 63220327925ace13756ae334c55a3baa
@@ -1571,7 +1571,9 @@ ICEDTEA_ENV = \
"DISTRIBUTION_ID=$(DIST_ID)" \
"ALT_JIBX_LIBS_PATH=$(JIBX_DEPS_DIR)" \
"ALT_NETX_DIST=$(abs_top_builddir)/netx.build" \
- "ALT_LIVECONNECT_DIST=$(abs_top_builddir)"
+ "ALT_LIVECONNECT_DIST=$(abs_top_builddir)" \
+ "DEBUG_CLASSFILES=true" \
+ "DEBUG_BINARIES=true"
if WITH_CACAO
ICEDTEA_ENV += \
@@ -1655,7 +1657,9 @@ ICEDTEA_ENV_ECJ = \
"JAR_ACCEPTS_STDIN_LIST=$(JAR_ACCEPTS_STDIN_LIST)" \
"DISABLE_NIMBUS=true" \
"ALT_NETX_DIST=$(abs_top_builddir)/netx.build" \
- "ALT_LIVECONNECT_DIST=$(abs_top_builddir)"
+ "ALT_LIVECONNECT_DIST=$(abs_top_builddir)" \
+ "DEBUG_CLASSFILES=true" \
+ "DEBUG_BINARIES=true"
if WITH_CACAO
ICEDTEA_ENV_ECJ += \
@@ -1997,8 +2001,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-copy-plugs.patch \
patches/hotspot/$(HSBUILD)/icedtea-text-relocations.patch \
patches/icedtea-graphics.patch \
- patches/icedtea-debuginfo.patch \
- patches/hotspot/$(HSBUILD)/icedtea-debuginfo.patch \
patches/icedtea-ssl.patch \
$(PLUGIN_PATCH) \
patches/icedtea-webstart.patch \
@@ -2051,7 +2053,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-signed-types.patch \
patches/icedtea-lc_ctype.patch \
patches/icedtea-messageutils.patch \
- patches/icedtea-javac-debuginfo.patch \
patches/icedtea-xjc.patch \
patches/icedtea-renderer-crossing.patch \
patches/icedtea-tests-jdk.patch \
diff -r f95ae75a68c6 -r 8e5de53d67cd patches/ecj/icedtea.patch
--- a/patches/ecj/icedtea.patch Thu Jun 11 22:40:38 2009 +0100
+++ b/patches/ecj/icedtea.patch Tue Jun 16 11:04:53 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-05-28 09:03:57.000000000 +0100
++++ openjdk-ecj/corba/make/com/sun/corba/se/Makefile 2009-06-15 17:19:32.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
@@ -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-05-28 09:03:57.000000000 +0100
++++ openjdk-ecj/corba/make/common/Defs.gmk 2009-06-15 17:19:32.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-05-28 03:44:57.000000000 +0100
-+++ openjdk-ecj/corba/make/common/Defs-linux.gmk 2009-05-28 09:03:57.000000000 +0100
+--- openjdk-ecj.orig/corba/make/common/Defs-linux.gmk 2009-06-15 17:14:30.000000000 +0100
++++ openjdk-ecj/corba/make/common/Defs-linux.gmk 2009-06-15 17:19:32.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-05-28 09:03:57.000000000 +0100
++++ openjdk-ecj/corba/make/common/Rules.gmk 2009-06-15 17:19:32.000000000 +0100
@@ -201,8 +201,10 @@
$(ECHO) "# Java sources to be compiled: (listed in file $(JAVA_SOURCE_LIST))"; \
$(CAT) $(JAVA_SOURCE_LIST); \
@@ -116,9 +116,9 @@ 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 2009-05-28 03:45:02.000000000 +0100
-+++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk 2009-05-28 09:03:57.000000000 +0100
-@@ -113,31 +113,14 @@
+--- 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-06-15 17:19:32.000000000 +0100
+@@ -120,31 +120,14 @@
JAVACFLAGS += $(OTHER_JAVACFLAGS)
# Needed for javah
@@ -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-05-28 09:03:57.000000000 +0100
++++ openjdk-ecj/corba/make/org/omg/sources/Makefile 2009-06-15 17:19:32.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-05-28 09:03:57.000000000 +0100
++++ openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile 2009-06-15 17:19:32.000000000 +0100
@@ -172,7 +172,6 @@
ACTIVATIONFILES = $(com_sun_corba_se_spi_activation_java:%=$(GENSRCDIR)/%)
@@ -255,8 +255,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 2009-05-28 03:45:02.000000000 +0100
-+++ openjdk-ecj/jaxp/make/build.xml 2009-05-28 09:03:57.000000000 +0100
+--- openjdk-ecj.orig/jaxp/make/build.xml 2009-06-15 14:57:04.000000000 +0100
++++ openjdk-ecj/jaxp/make/build.xml 2009-06-15 17:21:10.000000000 +0100
@@ -71,7 +71,10 @@
<mkdir dir="${build.toolclasses.dir}"/>
<javac srcdir="${make.tools.dir}/StripProperties"
@@ -269,19 +269,21 @@ diff -Nru openjdk-ecj.orig/jaxp/make/bui
<taskdef name="pstrip"
classname="StripPropertiesTask"
classpath="${build.toolclasses.dir}/"/>
-@@ -86,6 +89,8 @@
+@@ -86,7 +89,9 @@
memoryInitialSize="${javac.memoryInitialSize}"
memoryMaximumSize="${javac.memoryMaximumSize}"
- target="${javac.target}"
+ debug="${javac.debug}"
+- target="${javac.target}">
++ target="${javac.target}"
+ executable="${javac.executable}"
-+ source="1.5"
- debug="${javac.debug}">
++ source="1.5">
<compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/>
<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-05-28 03:45:02.000000000 +0100
-+++ openjdk-ecj/jaxp/make/Makefile 2009-05-28 09:03:57.000000000 +0100
-@@ -75,7 +75,7 @@
+--- openjdk-ecj.orig/jaxp/make/Makefile 2009-06-15 17:14:26.000000000 +0100
++++ openjdk-ecj/jaxp/make/Makefile 2009-06-15 17:19:32.000000000 +0100
+@@ -84,7 +84,7 @@
endif
ifdef ALT_BOOTDIR
@@ -291,9 +293,9 @@ 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-05-28 03:44:57.000000000 +0100
-+++ openjdk-ecj/jaxws/make/build.properties 2009-05-28 09:03:57.000000000 +0100
-@@ -37,7 +37,7 @@
+--- openjdk-ecj.orig/jaxws/make/build.properties 2009-06-15 17:14:30.000000000 +0100
++++ openjdk-ecj/jaxws/make/build.properties 2009-06-15 17:19:32.000000000 +0100
+@@ -36,7 +36,7 @@
# set the following to -version to verify the versions of javac being used
javac.version.opt =
# in time, there should be no exceptions to -Xlint:all
@@ -303,8 +305,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 2009-05-28 03:45:02.000000000 +0100
-+++ openjdk-ecj/jaxws/make/build.xml 2009-05-28 09:05:20.000000000 +0100
+--- openjdk-ecj.orig/jaxws/make/build.xml 2009-06-15 14:57:13.000000000 +0100
++++ openjdk-ecj/jaxws/make/build.xml 2009-06-15 17:22:06.000000000 +0100
@@ -93,7 +93,10 @@
<mkdir dir="${build.toolclasses.dir}"/>
<javac srcdir="${make.tools.dir}/StripProperties"
@@ -324,8 +326,8 @@ diff -Nru openjdk-ecj.orig/jaxws/make/bu
+ executable="${javac.executable}"
memoryInitialSize="${javac.memoryInitialSize}"
memoryMaximumSize="${javac.memoryMaximumSize}"
+ debug="${javac.debug}"
target="${javac.target}"
- debug="${javac.debug}"
- excludes="com/sun/tools/internal/txw2/**">
+ excludes="com/sun/tools/internal/txw2/**"
+ source="1.5">
@@ -334,9 +336,9 @@ 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-05-28 03:45:02.000000000 +0100
-+++ openjdk-ecj/jaxws/make/Makefile 2009-05-28 09:03:57.000000000 +0100
-@@ -75,8 +75,8 @@
+--- openjdk-ecj.orig/jaxws/make/Makefile 2009-06-15 17:14:26.000000000 +0100
++++ openjdk-ecj/jaxws/make/Makefile 2009-06-15 17:19:32.000000000 +0100
+@@ -84,8 +84,8 @@
endif
ifdef ALT_BOOTDIR
@@ -349,7 +351,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-05-28 09:03:57.000000000 +0100
++++ openjdk-ecj/jdk/make/common/BuildToolJar.gmk 2009-06-15 17:19:32.000000000 +0100
@@ -43,7 +43,8 @@
@$(prep-target)
@$(MKDIR) -p $(BUILDTOOLCLASSDIR)
@@ -361,8 +363,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 2009-05-28 03:45:02.000000000 +0100
-+++ openjdk-ecj/jdk/make/common/Release.gmk 2009-05-28 09:03:57.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/common/Release.gmk 2009-06-15 17:14:31.000000000 +0100
++++ openjdk-ecj/jdk/make/common/Release.gmk 2009-06-15 17:19:32.000000000 +0100
@@ -654,10 +654,23 @@
$(RES_JAR_ARGLIST): $(RES_JAR_FILELIST)
$(prep-target)
@@ -449,7 +451,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-05-28 09:03:57.000000000 +0100
++++ openjdk-ecj/jdk/make/common/Rules.gmk 2009-06-15 17:19:32.000000000 +0100
@@ -237,8 +237,9 @@
$(ECHO) "# Java sources to be compiled: (listed in file $<)"; \
$(CAT) $<.filtered; \
@@ -476,9 +478,9 @@ 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-05-28 03:44:57.000000000 +0100
-+++ openjdk-ecj/jdk/make/common/shared/Defs-java.gmk 2009-05-28 09:03:57.000000000 +0100
-@@ -129,33 +129,22 @@
+--- openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk 2009-06-15 17:14:30.000000000 +0100
++++ openjdk-ecj/jdk/make/common/shared/Defs-java.gmk 2009-06-15 17:19:32.000000000 +0100
+@@ -135,33 +135,22 @@
JAVACFLAGS += $(OTHER_JAVACFLAGS)
# Needed for javah
@@ -514,8 +516,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-05-28 03:45:02.000000000 +0100
-+++ openjdk-ecj/jdk/make/java/nio/Makefile 2009-05-28 09:03:57.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/java/nio/Makefile 2009-06-15 17:14:31.000000000 +0100
++++ openjdk-ecj/jdk/make/java/nio/Makefile 2009-06-15 17:19:32.000000000 +0100
@@ -31,7 +31,7 @@
PACKAGE = java.nio
LIBRARY = nio
@@ -527,7 +529,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-05-28 09:03:57.000000000 +0100
++++ openjdk-ecj/jdk/make/java/text/Makefile 2009-06-15 17:19:32.000000000 +0100
@@ -81,8 +81,8 @@
-sourcepath $(TEXT_SRCDIR) \
$(TEXT_SOURCES)
@@ -541,7 +543,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-05-28 09:03:57.000000000 +0100
++++ openjdk-ecj/jdk/make/Makefile 2009-06-15 17:19:32.000000000 +0100
@@ -239,7 +239,7 @@
all build:: sanity-all post-sanity-all
@@ -553,7 +555,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-05-28 09:03:57.000000000 +0100
++++ openjdk-ecj/jdk/make/sun/awt/FILES_export_unix.gmk 2009-06-15 17:19:32.000000000 +0100
@@ -189,3 +189,5 @@
java/awt/dnd/DnDConstants.java \
sun/awt/CausedFocusEvent.java
@@ -562,7 +564,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-05-28 09:03:57.000000000 +0100
++++ openjdk-ecj/jdk/make/sun/awt/Makefile 2009-06-15 17:19:32.000000000 +0100
@@ -401,10 +401,9 @@
COMPILEFONTCONFIG_JARFILE = $(BUILDTOOLJARDIR)/compilefontconfig.jar
@@ -579,7 +581,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-05-28 09:03:57.000000000 +0100
++++ openjdk-ecj/jdk/make/sun/javazic/Makefile 2009-06-15 17:19:32.000000000 +0100
@@ -62,7 +62,8 @@
$(WORKDIR)/$(MAPFILE): $(BUILDTOOLJARDIR)/javazic.jar $(TZFILES)
$(RM) -r $(@D)
@@ -592,7 +594,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-05-28 09:03:57.000000000 +0100
++++ openjdk-ecj/jdk/make/sun/text/Makefile 2009-06-15 17:19:32.000000000 +0100
@@ -85,8 +85,9 @@
$(BOOT_JAVAC_CMD) -d $(TEXT_CLASSES) \
-sourcepath $(TEXT_SRCDIR) \
@@ -606,8 +608,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-05-28 03:45:02.000000000 +0100
-+++ openjdk-ecj/jdk/make/sun/xawt/Makefile 2009-05-28 09:03:57.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/sun/xawt/Makefile 2009-06-15 17:14:31.000000000 +0100
++++ openjdk-ecj/jdk/make/sun/xawt/Makefile 2009-06-15 17:19:32.000000000 +0100
@@ -294,11 +294,7 @@
TEMPDIR_CLASSES = $(TEMPDIR)/classes
@@ -645,8 +647,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-05-28 03:44:01.000000000 +0100
-+++ openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2009-05-28 09:03:57.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2009-06-15 17:13:39.000000000 +0100
++++ openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2009-06-15 17:19:32.000000000 +0100
@@ -647,9 +647,6 @@
throws FileNotFoundException, IOException {
BufferedReader in = new BufferedReader(new FileReader(theTemplateFileName));
@@ -666,8 +668,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-05-28 03:43:50.000000000 +0100
-+++ openjdk-ecj/jdk/src/share/classes/java/lang/Double.java 2009-05-28 09:03:57.000000000 +0100
+--- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Double.java 2009-06-15 17:13:27.000000000 +0100
++++ openjdk-ecj/jdk/src/share/classes/java/lang/Double.java 2009-06-15 17:19:32.000000000 +0100
@@ -76,7 +76,7 @@
* {@code 0x1.fffffffffffffP+1023} and also equal to
* {@code Double.longBitsToDouble(0x7fefffffffffffffL)}.
@@ -696,8 +698,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-05-28 03:43:50.000000000 +0100
-+++ openjdk-ecj/jdk/src/share/classes/java/lang/Float.java 2009-05-28 09:03:57.000000000 +0100
+--- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Float.java 2009-06-15 17:13:27.000000000 +0100
++++ openjdk-ecj/jdk/src/share/classes/java/lang/Float.java 2009-06-15 17:19:32.000000000 +0100
@@ -76,7 +76,7 @@
* {@code 0x1.fffffeP+127f} and also equal to
* {@code Float.intBitsToFloat(0x7f7fffff)}.
@@ -727,7 +729,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-05-28 09:03:57.000000000 +0100
++++ openjdk-ecj/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2009-06-15 17:19:32.000000000 +0100
@@ -27,6 +27,7 @@
#define OGLContext_h_Included
@@ -793,9 +795,9 @@ 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 2009-03-30 17:23:27.000000000 +0100
-+++ openjdk-ecj/langtools/make/build.xml 2009-05-28 09:03:57.000000000 +0100
-@@ -502,7 +502,9 @@
+--- openjdk-ecj.orig/langtools/make/build.xml 2009-06-15 14:59:52.000000000 +0100
++++ openjdk-ecj/langtools/make/build.xml 2009-06-15 17:19:32.000000000 +0100
+@@ -509,7 +509,9 @@
includes="@{includes}"
sourcepath=""
includeAntRuntime="no"
@@ -806,7 +808,7 @@ diff -Nru openjdk-ecj.orig/langtools/mak
<compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
<compilerarg line="${javac.version.opt}"/>
<compilerarg line="-Xlint"/>
-@@ -517,7 +519,9 @@
+@@ -524,7 +526,9 @@
includeAntRuntime="no"
target="@{javac.target}"
debug="${javac.debug}"
@@ -817,7 +819,7 @@ diff -Nru openjdk-ecj.orig/langtools/mak
<compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
<compilerarg value="-Xbootclasspath/p:@{classes.dir}"/>
<compilerarg line="${javac.no.jdk.warnings}"/>
-@@ -571,7 +575,8 @@
+@@ -578,7 +582,8 @@
executable="${boot.java.home}/bin/javac"
srcdir="${make.tools.dir}/CompileProperties"
destdir="${build.toolclasses.dir}/"
@@ -828,9 +830,9 @@ diff -Nru openjdk-ecj.orig/langtools/mak
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 2009-05-28 03:45:02.000000000 +0100
-+++ openjdk-ecj/langtools/make/Makefile 2009-05-28 09:03:57.000000000 +0100
-@@ -112,7 +112,7 @@
+--- openjdk-ecj.orig/langtools/make/Makefile 2009-06-15 17:14:26.000000000 +0100
++++ openjdk-ecj/langtools/make/Makefile 2009-06-15 17:19:32.000000000 +0100
+@@ -122,7 +122,7 @@
ifdef ALT_BOOTDIR
ANT_OPTIONS += -Dboot.java.home=$(ALT_BOOTDIR)
@@ -840,8 +842,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-05-28 03:44:57.000000000 +0100
-+++ openjdk-ecj/make/jdk-rules.gmk 2009-05-28 09:03:57.000000000 +0100
+--- openjdk-ecj.orig/make/jdk-rules.gmk 2009-06-15 17:14:30.000000000 +0100
++++ openjdk-ecj/make/jdk-rules.gmk 2009-06-15 17:19:32.000000000 +0100
@@ -58,7 +58,7 @@
endif
diff -r f95ae75a68c6 -r 8e5de53d67cd patches/hotspot/default/icedtea-debuginfo.patch
--- a/patches/hotspot/default/icedtea-debuginfo.patch Thu Jun 11 22:40:38 2009 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-diff -Nru openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
---- openjdk.orig/hotspot/make/linux/makefiles/gcc.make 2008-08-20 22:58:22.000000000 +0100
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make 2008-08-20 23:01:45.000000000 +0100
-@@ -62,6 +62,10 @@
- CFLAGS += -D_REENTRANT
- CFLAGS += -fcheck-new
-
-+# Always generate full debuginfo on Linux. It'll be in a separate
-+# debuginfo package when building RPMs.
-+CFLAGS += -g
-+
- ARCHFLAG = $(ARCHFLAG/$(BUILDARCH))
- ARCHFLAG/i486 = -m32 -march=i586
- ARCHFLAG/amd64 = -m64
-
diff -r f95ae75a68c6 -r 8e5de53d67cd patches/hotspot/default/icedtea-zero-build.patch
--- a/patches/hotspot/default/icedtea-zero-build.patch Thu Jun 11 22:40:38 2009 +0100
+++ b/patches/hotspot/default/icedtea-zero-build.patch Tue Jun 16 11:04:53 2009 +0100
@@ -1,6 +1,6 @@ diff -Nru openjdk.orig/hotspot/make/defs
diff -Nru openjdk.orig/hotspot/make/defs.make openjdk/hotspot/make/defs.make
---- openjdk.orig/hotspot/make/defs.make 2008-11-22 00:11:18.000000000 +0000
-+++ openjdk/hotspot/make/defs.make 2008-11-29 02:14:15.000000000 +0000
+--- openjdk.orig/hotspot/make/defs.make 2009-03-30 17:15:27.000000000 +0100
++++ openjdk/hotspot/make/defs.make 2009-06-15 17:09:12.000000000 +0100
More information about the distro-pkg-dev
mailing list