FYI: Update IcedTea to OpenJDK b35
Andrew John Hughes
gnu_andrew at member.fsf.org
Fri Sep 12 17:08:19 PDT 2008
Necessary changes for transition to b33->b35:
* Remove citypeflow patch; applied upstream.
* Recreate the ecj patch due to changes in sa.make.
* Add javax.script to the hotspot-tools pre-build so
that the new HotSpot SOQL tool.
ChangeLog:
2008-09-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
* patches/icedtea-hotspot-citypeflow.patch:
Removed, fixed upstream.
* Makefile.am: Bump to b35, remove citypeflow patch.
* patches/icedtea-ecj.patch: Recreated against b35.
* tools-copy/tools-jdk-copy-files.txt: Add javax.script.
--
Andrew :)
Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
-------------- next part --------------
diff -r 264a3aa199a0 Makefile.am
--- a/Makefile.am Fri Sep 05 16:19:11 2008 +0100
+++ b/Makefile.am Sat Sep 13 01:00:10 2008 +0100
@@ -1,6 +1,6 @@
-OPENJDK_DATE = 14_aug_2008
-OPENJDK_MD5SUM = 536c8f7b35bfb2640bdda31482d2693f
-OPENJDK_VERSION = b33
+OPENJDK_DATE = 11_sep_2008
+OPENJDK_MD5SUM = 324ee7ead3c2e548a129730685815da4
+OPENJDK_VERSION = b35
CACAO_VERSION = 0.99.3
CACAO_MD5SUM = 80de3ad344c1a20c086ec5f1390bd1b8
@@ -555,7 +555,6 @@
patches/icedtea-jdk-docs-target.patch \
patches/icedtea-mbeanintrospector.patch \
patches/icedtea-hotspot-gcc-pr36917.patch \
- patches/icedtea-hotspot-citypeflow.patch \
patches/icedtea-alpha-fixes.patch \
patches/icedtea-alt-jar.patch \
patches/icedtea-enum-bug-181.patch \
diff -r 264a3aa199a0 patches/icedtea-ecj.patch
--- a/patches/icedtea-ecj.patch Fri Sep 05 16:19:11 2008 +0100
+++ b/patches/icedtea-ecj.patch Sat Sep 13 01:00:10 2008 +0100
@@ -1,6 +1,6 @@
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-08-14 08:39:29.000000000 +0100
-+++ openjdk-ecj/corba/make/com/sun/corba/se/Makefile 2008-08-21 01:49:52.000000000 +0100
+--- openjdk-ecj.orig/corba/make/com/sun/corba/se/Makefile 2008-09-11 08:40:17.000000000 +0100
++++ openjdk-ecj/corba/make/com/sun/corba/se/Makefile 2008-09-12 21:34:38.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/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-08-21 01:49:52.000000000 +0100
++++ openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile 2008-09-12 21:34:38.000000000 +0100
@@ -0,0 +1,38 @@
+#
+# Copyright 2001-2005 Sun Microsystems, Inc. All Rights Reserved.
@@ -53,8 +53,8 @@
+#
+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-08-14 08:39:29.000000000 +0100
-+++ openjdk-ecj/corba/make/common/Defs.gmk 2008-08-21 01:49:52.000000000 +0100
+--- openjdk-ecj.orig/corba/make/common/Defs.gmk 2008-09-11 08:40:17.000000000 +0100
++++ openjdk-ecj/corba/make/common/Defs.gmk 2008-09-12 21:34:38.000000000 +0100
@@ -53,6 +53,13 @@
_OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH)
@@ -88,9 +88,9 @@
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-08-21 01:28:49.000000000 +0100
-+++ openjdk-ecj/corba/make/common/Defs-linux.gmk 2008-08-21 01:49:52.000000000 +0100
-@@ -262,7 +262,7 @@
+--- openjdk-ecj.orig/corba/make/common/Defs-linux.gmk 2008-09-12 21:22:58.000000000 +0100
++++ openjdk-ecj/corba/make/common/Defs-linux.gmk 2008-09-12 21:34:38.000000000 +0100
+@@ -276,7 +276,7 @@
fi; \
done)
JVMLIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH)/$(VM_NAME) -ljvm
@@ -100,8 +100,8 @@
#
# 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-08-14 08:39:29.000000000 +0100
-+++ openjdk-ecj/corba/make/common/Rules.gmk 2008-08-21 01:49:52.000000000 +0100
+--- openjdk-ecj.orig/corba/make/common/Rules.gmk 2008-09-11 08:40:17.000000000 +0100
++++ openjdk-ecj/corba/make/common/Rules.gmk 2008-09-12 21:34:38.000000000 +0100
@@ -197,8 +197,10 @@
$(ECHO) "# Java sources to be compiled: (listed in file $(JAVA_SOURCE_LIST))"; \
$(CAT) $(JAVA_SOURCE_LIST); \
@@ -116,8 +116,8 @@
@$(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-08-14 08:39:29.000000000 +0100
-+++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk 2008-08-21 01:49:52.000000000 +0100
+--- openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk 2008-09-11 08:40:17.000000000 +0100
++++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk 2008-09-12 21:34:38.000000000 +0100
@@ -117,31 +117,13 @@
JAVACFLAGS += $(OTHER_JAVACFLAGS)
@@ -155,8 +155,8 @@
# 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-08-14 08:39:29.000000000 +0100
-+++ openjdk-ecj/corba/make/org/omg/sources/Makefile 2008-08-21 01:49:52.000000000 +0100
+--- openjdk-ecj.orig/corba/make/org/omg/sources/Makefile 2008-09-11 08:40:17.000000000 +0100
++++ openjdk-ecj/corba/make/org/omg/sources/Makefile 2008-09-12 21:34:38.000000000 +0100
@@ -93,8 +93,6 @@
POAHELHOLFILES = $(POA_GENERATED_HELP_HOL_java:%=$(GENSRCDIR)/%)
@@ -234,8 +234,8 @@
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-08-21 01:28:48.000000000 +0100
-+++ openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile 2008-08-21 01:49:52.000000000 +0100
+--- openjdk-ecj.orig/corba/make/sun/rmi/corbalogsources/Makefile 2008-09-12 21:22:57.000000000 +0100
++++ openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile 2008-09-12 21:34:38.000000000 +0100
@@ -172,7 +172,6 @@
ACTIVATIONFILES = $(com_sun_corba_se_spi_activation_java:%=$(GENSRCDIR)/%)
@@ -253,8 +253,8 @@
portableactivation.idl.compile: $(PORTABLEACTIVATIONFILES)
diff -Nru openjdk-ecj.orig/hotspot/make/linux/Makefile openjdk-ecj/hotspot/make/linux/Makefile
---- openjdk-ecj.orig/hotspot/make/linux/Makefile 2008-08-21 01:28:49.000000000 +0100
-+++ openjdk-ecj/hotspot/make/linux/Makefile 2008-08-21 01:49:52.000000000 +0100
+--- openjdk-ecj.orig/hotspot/make/linux/Makefile 2008-09-12 21:22:58.000000000 +0100
++++ openjdk-ecj/hotspot/make/linux/Makefile 2008-09-12 21:34:38.000000000 +0100
@@ -263,28 +263,24 @@
$(TARGETS_C2): $(SUBDIRS_C2)
@@ -285,20 +285,22 @@
cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
endif
diff -Nru openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make openjdk-ecj/hotspot/make/linux/makefiles/sa.make
---- openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make 2008-08-21 01:28:49.000000000 +0100
-+++ openjdk-ecj/hotspot/make/linux/makefiles/sa.make 2008-08-21 01:49:52.000000000 +0100
-@@ -72,7 +72,7 @@
- $(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \
+--- openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make 2008-09-12 21:22:58.000000000 +0100
++++ openjdk-ecj/hotspot/make/linux/makefiles/sa.make 2008-09-12 21:39:40.000000000 +0100
+@@ -74,8 +74,8 @@
mkdir -p $(SA_CLASSDIR); \
fi
-- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -g -d $(SA_CLASSDIR) $(AGENT_ALLFILES)
-+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -g -d $(SA_CLASSDIR) $(AGENT_ALLFILES)
+
+- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES1)
+- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES2)
++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES1)
++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES2)
+
$(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
$(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
- $(QUIETLY) $(REMOTE) $(RUN.JAR) cf $@ -C $(SA_CLASSDIR)/ .
diff -Nru openjdk-ecj.orig/jaxp/make/build.xml openjdk-ecj/jaxp/make/build.xml
---- openjdk-ecj.orig/jaxp/make/build.xml 2008-08-14 08:40:25.000000000 +0100
-+++ openjdk-ecj/jaxp/make/build.xml 2008-08-21 01:49:52.000000000 +0100
+--- openjdk-ecj.orig/jaxp/make/build.xml 2008-09-11 08:41:13.000000000 +0100
++++ openjdk-ecj/jaxp/make/build.xml 2008-09-12 21:34:38.000000000 +0100
@@ -71,7 +71,10 @@
<mkdir dir="${build.toolclasses.dir}"/>
<javac srcdir="${make.tools.dir}/StripProperties"
@@ -323,8 +325,8 @@
<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 2008-08-21 01:28:49.000000000 +0100
-+++ openjdk-ecj/jaxp/make/Makefile 2008-08-21 01:49:52.000000000 +0100
+--- openjdk-ecj.orig/jaxp/make/Makefile 2008-09-12 21:22:58.000000000 +0100
++++ openjdk-ecj/jaxp/make/Makefile 2008-09-12 21:34:38.000000000 +0100
@@ -80,7 +80,7 @@
endif
@@ -335,8 +337,8 @@
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-08-14 08:40:44.000000000 +0100
-+++ openjdk-ecj/jaxws/make/build.properties 2008-08-21 01:49:52.000000000 +0100
+--- openjdk-ecj.orig/jaxws/make/build.properties 2008-09-12 21:22:58.000000000 +0100
++++ openjdk-ecj/jaxws/make/build.properties 2008-09-12 21:34:38.000000000 +0100
@@ -37,7 +37,7 @@
# set the following to -version to verify the versions of javac being used
javac.version.opt =
@@ -347,8 +349,8 @@
# 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-08-21 01:28:49.000000000 +0100
-+++ openjdk-ecj/jaxws/make/build.xml 2008-08-21 01:49:52.000000000 +0100
+--- openjdk-ecj.orig/jaxws/make/build.xml 2008-09-12 21:22:58.000000000 +0100
++++ openjdk-ecj/jaxws/make/build.xml 2008-09-12 21:34:38.000000000 +0100
@@ -84,7 +84,10 @@
<mkdir dir="${build.toolclasses.dir}"/>
<javac srcdir="${make.tools.dir}/StripProperties"
@@ -380,8 +382,8 @@
<compilerarg line="${javac.no.jdk.warnings}"/>
</javac>
diff -Nru openjdk-ecj.orig/jaxws/make/Makefile openjdk-ecj/jaxws/make/Makefile
---- openjdk-ecj.orig/jaxws/make/Makefile 2008-08-21 01:28:49.000000000 +0100
-+++ openjdk-ecj/jaxws/make/Makefile 2008-08-21 01:49:52.000000000 +0100
+--- openjdk-ecj.orig/jaxws/make/Makefile 2008-09-12 21:22:58.000000000 +0100
++++ openjdk-ecj/jaxws/make/Makefile 2008-09-12 21:34:38.000000000 +0100
@@ -80,8 +80,8 @@
endif
@@ -394,8 +396,8 @@
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-08-14 08:42:49.000000000 +0100
-+++ openjdk-ecj/jdk/make/common/BuildToolJar.gmk 2008-08-21 01:49:52.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/common/BuildToolJar.gmk 2008-09-11 08:44:06.000000000 +0100
++++ openjdk-ecj/jdk/make/common/BuildToolJar.gmk 2008-09-12 21:34:38.000000000 +0100
@@ -43,7 +43,8 @@
@$(prep-target)
@$(MKDIR) -p $(BUILDTOOLCLASSDIR)
@@ -407,8 +409,8 @@
-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-08-21 01:28:49.000000000 +0100
-+++ openjdk-ecj/jdk/make/common/Release.gmk 2008-08-21 02:23:31.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/common/Release.gmk 2008-09-12 21:22:58.000000000 +0100
++++ openjdk-ecj/jdk/make/common/Release.gmk 2008-09-12 21:34:38.000000000 +0100
@@ -651,10 +651,19 @@
$(RES_JAR_ARGLIST): $(RES_JAR_FILELIST)
$(prep-target)
@@ -490,8 +492,8 @@
$(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-08-14 08:42:49.000000000 +0100
-+++ openjdk-ecj/jdk/make/common/Rules.gmk 2008-08-26 00:30:58.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/common/Rules.gmk 2008-09-11 08:44:06.000000000 +0100
++++ openjdk-ecj/jdk/make/common/Rules.gmk 2008-09-12 21:34:38.000000000 +0100
@@ -237,8 +237,9 @@
$(ECHO) "# Java sources to be compiled: (listed in file $<)"; \
$(CAT) $<.filtered; \
@@ -518,8 +520,8 @@
@$(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-08-21 01:28:48.000000000 +0100
-+++ openjdk-ecj/jdk/make/common/shared/Defs-java.gmk 2008-08-21 01:49:52.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk 2008-09-12 21:22:58.000000000 +0100
++++ openjdk-ecj/jdk/make/common/shared/Defs-java.gmk 2008-09-12 21:34:38.000000000 +0100
@@ -121,30 +121,19 @@
JAVACFLAGS += $(OTHER_JAVACFLAGS)
@@ -553,8 +555,8 @@
# 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-08-14 08:42:49.000000000 +0100
-+++ openjdk-ecj/jdk/make/java/nio/Makefile 2008-08-21 01:49:52.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/java/nio/Makefile 2008-09-11 08:44:06.000000000 +0100
++++ openjdk-ecj/jdk/make/java/nio/Makefile 2008-09-12 21:34:38.000000000 +0100
@@ -31,7 +31,7 @@
PACKAGE = java.nio
LIBRARY = nio
@@ -565,8 +567,8 @@
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-08-14 08:42:49.000000000 +0100
-+++ openjdk-ecj/jdk/make/java/text/Makefile 2008-08-21 01:49:52.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/java/text/Makefile 2008-09-11 08:44:06.000000000 +0100
++++ openjdk-ecj/jdk/make/java/text/Makefile 2008-09-12 21:34:38.000000000 +0100
@@ -80,8 +80,8 @@
-sourcepath $(TEXT_SRCDIR) \
$(TEXT_SOURCES)
@@ -579,8 +581,8 @@
-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-08-14 08:42:48.000000000 +0100
-+++ openjdk-ecj/jdk/make/Makefile 2008-08-21 01:49:52.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/Makefile 2008-09-11 08:44:05.000000000 +0100
++++ openjdk-ecj/jdk/make/Makefile 2008-09-12 21:34:38.000000000 +0100
@@ -239,7 +239,7 @@
all build:: sanity-all post-sanity-all
@@ -591,8 +593,8 @@
$(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-08-25 23:11:34.000000000 +0100
-+++ openjdk-ecj/jdk/make/sun/awt/FILES_export_unix.gmk 2008-08-25 23:13:37.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/sun/awt/FILES_export_unix.gmk 2008-09-11 08:44:07.000000000 +0100
++++ openjdk-ecj/jdk/make/sun/awt/FILES_export_unix.gmk 2008-09-12 21:34:38.000000000 +0100
@@ -223,3 +223,5 @@
sun/awt/CausedFocusEvent.java \
sun/awt/motif/MEmbedCanvasPeer.java
@@ -600,8 +602,8 @@
+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-08-14 08:42:50.000000000 +0100
-+++ openjdk-ecj/jdk/make/sun/awt/Makefile 2008-08-21 01:49:52.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/sun/awt/Makefile 2008-09-11 08:44:07.000000000 +0100
++++ openjdk-ecj/jdk/make/sun/awt/Makefile 2008-09-12 21:34:38.000000000 +0100
@@ -395,10 +395,9 @@
COMPILEFONTCONFIG_JARFILE = $(BUILDTOOLJARDIR)/compilefontconfig.jar
@@ -617,8 +619,8 @@
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-08-14 08:42:50.000000000 +0100
-+++ openjdk-ecj/jdk/make/sun/javazic/Makefile 2008-08-21 01:49:52.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/sun/javazic/Makefile 2008-09-11 08:44:07.000000000 +0100
++++ openjdk-ecj/jdk/make/sun/javazic/Makefile 2008-09-12 21:34:38.000000000 +0100
@@ -62,7 +62,8 @@
$(WORKDIR)/$(MAPFILE): $(BUILDTOOLJARDIR)/javazic.jar $(TZFILES)
$(RM) -r $(@D)
@@ -630,8 +632,8 @@
$(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-08-14 08:42:50.000000000 +0100
-+++ openjdk-ecj/jdk/make/sun/text/Makefile 2008-08-21 01:49:52.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/sun/text/Makefile 2008-09-11 08:44:08.000000000 +0100
++++ openjdk-ecj/jdk/make/sun/text/Makefile 2008-09-12 21:34:38.000000000 +0100
@@ -85,8 +85,9 @@
$(BOOT_JAVAC_CMD) -d $(TEXT_CLASSES) \
-sourcepath $(TEXT_SRCDIR) \
@@ -645,8 +647,8 @@
-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-08-14 08:42:50.000000000 +0100
-+++ openjdk-ecj/jdk/make/sun/xawt/Makefile 2008-08-21 01:49:52.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/sun/xawt/Makefile 2008-09-11 08:44:08.000000000 +0100
++++ openjdk-ecj/jdk/make/sun/xawt/Makefile 2008-09-12 21:34:38.000000000 +0100
@@ -276,11 +276,7 @@
TEMPDIR_CLASSES = $(TEMPDIR)/classes
@@ -684,8 +686,8 @@
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-08-14 08:42:51.000000000 +0100
-+++ openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2008-08-21 01:49:52.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2008-09-11 08:44:08.000000000 +0100
++++ openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2008-09-12 21:34:38.000000000 +0100
@@ -647,9 +647,6 @@
throws FileNotFoundException, IOException {
BufferedReader in = new BufferedReader(new FileReader(theTemplateFileName));
@@ -705,8 +707,8 @@
if (plane == 0 && bLatin1 == false) {
genCaseMapTableDeclaration(result);
diff -Nru openjdk-ecj.orig/jdk/make/tools/src/build/tools/spp/Spp.java openjdk-ecj/jdk/make/tools/src/build/tools/spp/Spp.java
---- openjdk-ecj.orig/jdk/make/tools/src/build/tools/spp/Spp.java 2008-08-21 02:50:19.000000000 +0100
-+++ openjdk-ecj/jdk/make/tools/src/build/tools/spp/Spp.java 2008-08-22 00:38:35.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/tools/src/build/tools/spp/Spp.java 2008-09-11 08:44:09.000000000 +0100
++++ openjdk-ecj/jdk/make/tools/src/build/tools/spp/Spp.java 2008-09-12 21:34:38.000000000 +0100
@@ -25,6 +25,10 @@
package build.tools.spp;
@@ -770,8 +772,8 @@
}
}
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-08-14 08:43:00.000000000 +0100
-+++ openjdk-ecj/jdk/src/share/classes/java/lang/Double.java 2008-08-21 01:49:52.000000000 +0100
+--- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Double.java 2008-09-11 08:44:19.000000000 +0100
++++ openjdk-ecj/jdk/src/share/classes/java/lang/Double.java 2008-09-12 21:34:38.000000000 +0100
@@ -76,7 +76,7 @@
* {@code 0x1.fffffffffffffP+1023} and also equal to
* {@code Double.longBitsToDouble(0x7fefffffffffffffL)}.
@@ -800,8 +802,8 @@
/**
* 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-08-14 08:43:00.000000000 +0100
-+++ openjdk-ecj/jdk/src/share/classes/java/lang/Float.java 2008-08-21 01:49:52.000000000 +0100
+--- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Float.java 2008-09-11 08:44:19.000000000 +0100
++++ openjdk-ecj/jdk/src/share/classes/java/lang/Float.java 2008-09-12 21:34:38.000000000 +0100
@@ -76,7 +76,7 @@
* {@code 0x1.fffffeP+127f} and also equal to
* {@code Float.intBitsToFloat(0x7f7fffff)}.
@@ -830,8 +832,8 @@
/**
* 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-08-29 23:11:06.000000000 +0100
-+++ openjdk-ecj/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2008-08-29 23:47:34.000000000 +0100
+--- openjdk-ecj.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2008-09-11 08:44:50.000000000 +0100
++++ openjdk-ecj/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2008-09-12 21:34:38.000000000 +0100
@@ -27,6 +27,7 @@
#define OGLContext_h_Included
@@ -897,8 +899,8 @@
/**
* 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-08-14 08:44:07.000000000 +0100
-+++ openjdk-ecj/langtools/make/build.xml 2008-08-21 01:49:52.000000000 +0100
+--- openjdk-ecj.orig/langtools/make/build.xml 2008-09-11 08:45:37.000000000 +0100
++++ openjdk-ecj/langtools/make/build.xml 2008-09-12 21:34:38.000000000 +0100
@@ -498,7 +498,10 @@
includes="@{includes}"
sourcepath=""
@@ -937,8 +939,8 @@
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-08-21 01:28:49.000000000 +0100
-+++ openjdk-ecj/langtools/make/Makefile 2008-08-21 01:49:52.000000000 +0100
+--- openjdk-ecj.orig/langtools/make/Makefile 2008-09-12 21:22:58.000000000 +0100
++++ openjdk-ecj/langtools/make/Makefile 2008-09-12 21:34:38.000000000 +0100
@@ -113,7 +113,7 @@
ifdef ALT_BOOTDIR
@@ -949,8 +951,8 @@
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 2008-08-21 01:28:49.000000000 +0100
-+++ openjdk-ecj/make/jdk-rules.gmk 2008-08-21 01:49:52.000000000 +0100
+--- openjdk-ecj.orig/make/jdk-rules.gmk 2008-09-12 21:22:58.000000000 +0100
++++ openjdk-ecj/make/jdk-rules.gmk 2008-09-12 21:34:38.000000000 +0100
@@ -58,7 +58,7 @@
endif
diff -r 264a3aa199a0 patches/icedtea-hotspot-citypeflow.patch
--- a/patches/icedtea-hotspot-citypeflow.patch Fri Sep 05 16:19:11 2008 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- openjdk/hotspot/src/share/vm/ci/ciTypeFlow.hpp~ 2008-07-10 22:04:30.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/ci/ciTypeFlow.hpp 2008-07-25 14:32:03.544802121 +0200
-@@ -130,7 +130,7 @@
-
- // Used as a combined index for locals and temps
- enum Cell {
-- Cell_0
-+ Cell_0, Cell_max = UINT_MAX
- };
-
- // A StateVector summarizes the type information at some
diff -r 264a3aa199a0 tools-copy/tools-jdk-copy-files.txt
--- a/tools-copy/tools-jdk-copy-files.txt Fri Sep 05 16:19:11 2008 +0100
+++ b/tools-copy/tools-jdk-copy-files.txt Sat Sep 13 01:00:10 2008 +0100
@@ -37,3 +37,4 @@
sun/tools/serialver/
sun/tools/tree/
sun/tools/util/
+javax/script/
More information about the distro-pkg-dev
mailing list