changeset in /hg/icedtea: Support building current IcedTea forest.
Andrew John Hughes
ahughes at redhat.com
Fri May 8 07:51:42 PDT 2009
changeset 1fe13f115ab0 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1fe13f115ab0
description:
Support building current IcedTea forest.
2009-04-16 Andrew John Hughes <ahughes at redhat.com>
* patches/icedtea-java2d-dasher.patch,
* patches/icedtea-jscheme.patch,
* patches/icedtea-snmp.patch:
Dropped, first two upstream, default of
no binary plugs makes third obsolete.
* Makefile.am: Updated.
* acinclude.m4: Find IcedTea on F10.
* patches/ecj/icedtea.patch,
* patches/icedtea-alpha-fixes.patch,
* patches/icedtea-arch.patch,
* patches/icedtea-doc-headers.patch,
* patches/icedtea-gcc-suffix.patch,
* patches/icedtea-libraries.patch,
* patches/icedtea-linker-libs-order.patch,
* patches/icedtea-tests-jdk.patch,
* patches/icedtea-uname.patch,
* patches/icedtea-zero-build.patch:
Recreated.
diffstat:
16 files changed, 384 insertions(+), 1955 deletions(-)
ChangeLog | 21
Makefile.am | 5
acinclude.m4 | 3
patches/ecj/icedtea.patch | 161 ++-
patches/icedtea-alpha-fixes.patch | 30
patches/icedtea-arch.patch | 32
patches/icedtea-doc-headers.patch | 53 -
patches/icedtea-gcc-suffix.patch | 16
patches/icedtea-java2d-dasher.patch | 11
patches/icedtea-jscheme.patch | 1262 -------------------------------
patches/icedtea-libraries.patch | 246 +++---
patches/icedtea-linker-libs-order.patch | 20
patches/icedtea-snmp.patch | 235 -----
patches/icedtea-tests-jdk.patch | 85 --
patches/icedtea-uname.patch | 50 -
patches/icedtea-zero-build.patch | 109 +-
diffs (truncated from 3655 to 500 lines):
diff -r bf7c34ac17a5 -r 1fe13f115ab0 ChangeLog
--- a/ChangeLog Fri Mar 20 11:57:47 2009 +0000
+++ b/ChangeLog Wed Apr 22 16:53:21 2009 +0100
@@ -1,3 +1,24 @@ 2009-03-20 Andrew John Hughes <ahughes
+2009-04-16 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/icedtea-java2d-dasher.patch,
+ * patches/icedtea-jscheme.patch,
+ * patches/icedtea-snmp.patch:
+ Dropped, first two upstream, default of
+ no binary plugs makes third obsolete.
+ * Makefile.am: Updated.
+ * acinclude.m4: Find IcedTea on F10.
+ * patches/ecj/icedtea.patch,
+ * patches/icedtea-alpha-fixes.patch,
+ * patches/icedtea-arch.patch,
+ * patches/icedtea-doc-headers.patch,
+ * patches/icedtea-gcc-suffix.patch,
+ * patches/icedtea-libraries.patch,
+ * patches/icedtea-linker-libs-order.patch,
+ * patches/icedtea-tests-jdk.patch,
+ * patches/icedtea-uname.patch,
+ * patches/icedtea-zero-build.patch:
+ Recreated.
+
2009-03-20 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Switch to IcedTea
diff -r bf7c34ac17a5 -r 1fe13f115ab0 Makefile.am
--- a/Makefile.am Fri Mar 20 11:57:47 2009 +0000
+++ b/Makefile.am Wed Apr 22 16:53:21 2009 +0100
@@ -1741,8 +1741,7 @@ endif
endif
ICEDTEA_FSG_PATCHES = \
- patches/icedtea-idl.patch \
- patches/icedtea-jscheme.patch
+ patches/icedtea-idl.patch
ICEDTEA_PATCHES = \
patches/icedtea-version.patch \
@@ -1806,7 +1805,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-javac-debuginfo.patch \
patches/icedtea-xjc.patch \
patches/icedtea-renderer-crossing.patch \
- patches/icedtea-snmp.patch \
patches/icedtea-tests-jdk.patch \
patches/icedtea-stroker-finish.patch \
patches/icedtea-alsa-default-device.patch \
@@ -1826,7 +1824,6 @@ ICEDTEA_PATCHES = \
patches/security/icedtea-6766136.patch \
patches/hotspot/$(HSBUILD)/icedtea-includedb.patch \
patches/icedtea-demo-swingapplet.patch \
- patches/icedtea-java2d-dasher.patch \
patches/icedtea-jvmtiEnv.patch \
patches/icedtea-xml-encodinginfo.patch \
patches/icedtea-cc-interp-backedge.patch \
diff -r bf7c34ac17a5 -r 1fe13f115ab0 acinclude.m4
--- a/acinclude.m4 Fri Mar 20 11:57:47 2009 +0000
+++ b/acinclude.m4 Wed Apr 22 16:53:21 2009 +0100
@@ -1164,7 +1164,8 @@ AC_DEFUN([AC_CHECK_FOR_ICEDTEA],
SYSTEM_ICEDTEA_DIR=
])
if test -z "${SYSTEM_ICEDTEA_DIR}"; then
- for dir in /usr/lib/jvm/java-icedtea /usr/lib/jvm/icedtea6 /usr/lib/jvm/java-6-openjdk ; do
+ for dir in /usr/lib/jvm/java-icedtea /usr/lib/jvm/java-openjdk \
+ /usr/lib/jvm/icedtea6 /usr/lib/jvm/java-6-openjdk ; do
if test -d $dir; then
SYSTEM_ICEDTEA_DIR=$dir
break
diff -r bf7c34ac17a5 -r 1fe13f115ab0 patches/ecj/icedtea.patch
--- a/patches/ecj/icedtea.patch Fri Mar 20 11:57:47 2009 +0000
+++ b/patches/ecj/icedtea.patch Wed Apr 22 16:53:21 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-02-05 08:40:51.000000000 +0000
-+++ openjdk-ecj/corba/make/com/sun/corba/se/Makefile 2009-02-10 19:24:54.000000000 +0000
+--- openjdk-ecj.orig/corba/make/com/sun/corba/se/Makefile 2009-03-20 11:54:59.000000000 +0000
++++ openjdk-ecj/corba/make/com/sun/corba/se/Makefile 2009-04-16 18:21:48.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-02-10 19:24:54.000000000 +0000
++++ openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile 2009-04-16 18:21:48.000000000 +0100
@@ -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 2009-02-05 08:40:51.000000000 +0000
-+++ openjdk-ecj/corba/make/common/Defs.gmk 2009-02-10 19:24:54.000000000 +0000
+--- openjdk-ecj.orig/corba/make/common/Defs.gmk 2009-03-20 11:54:59.000000000 +0000
++++ openjdk-ecj/corba/make/common/Defs.gmk 2009-04-16 18:21:48.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-02-10 18:12:00.000000000 +0000
-+++ openjdk-ecj/corba/make/common/Defs-linux.gmk 2009-02-10 19:24:54.000000000 +0000
+--- openjdk-ecj.orig/corba/make/common/Defs-linux.gmk 2009-04-16 15:16:30.000000000 +0100
++++ openjdk-ecj/corba/make/common/Defs-linux.gmk 2009-04-16 18:21:48.000000000 +0100
@@ -276,7 +276,7 @@
fi; \
done)
@@ -100,14 +100,14 @@ 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-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 @@
+--- openjdk-ecj.orig/corba/make/common/Rules.gmk 2009-04-14 15:55:17.000000000 +0100
++++ openjdk-ecj/corba/make/common/Rules.gmk 2009-04-16 18:35:11.000000000 +0100
+@@ -201,8 +201,10 @@
$(ECHO) "# Java sources to be compiled: (listed in file $(JAVA_SOURCE_LIST))"; \
$(CAT) $(JAVA_SOURCE_LIST); \
$(ECHO) "# Running javac:"; \
-- $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
-- $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
+- $(ECHO) $(JAVAC_CMD) $(JAVAC_PREFER_SOURCE) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
+- $(JAVAC_CMD) $(JAVAC_PREFER_SOURCE) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
+ $(ECHO) $(JAVAC_CMD) -bootclasspath $(ICEDTEA_RT):$(ICEDTEA_BUILD_DIR)/corba/classes \
+ -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
+ $(JAVAC_CMD) -bootclasspath $(ICEDTEA_RT):$(ICEDTEA_BUILD_DIR)/corba/classes \
@@ -116,16 +116,16 @@ 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-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 @@
+--- openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk 2009-04-16 15:16:30.000000000 +0100
++++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk 2009-04-16 18:32:43.000000000 +0100
+@@ -113,31 +113,14 @@
JAVACFLAGS += $(OTHER_JAVACFLAGS)
# Needed for javah
--JAVAHFLAGS += -bootclasspath $(CLASSBINDIR)
-+JAVAHFLAGS += -bootclasspath $(CLASSBINDIR):$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)
-
--# Langtools
+-JAVAHFLAGS += -classpath $(CLASSBINDIR)
++JAVAHFLAGS += -classpath $(CLASSBINDIR):$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)
+
+ # Langtools
-ifdef LANGTOOLS_DIST
- JAVAC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javac.jar
- JAVAH_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javah.jar
@@ -143,20 +143,22 @@ diff -Nru openjdk-ecj.orig/corba/make/co
-else
- # If no explicit tools, use boot tools (add VM flags in this case)
- JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \
+- $(JAVACFLAGS)
+- JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \
+- $(JAVAHFLAGS)
+- JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%)
+-endif
+# If no explicit tools, use boot tools (add VM flags in this case)
+JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \
- $(JAVACFLAGS)
-- JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \
++ $(JAVACFLAGS)
+JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \
- $(JAVAHFLAGS)
-- JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%)
--endif
++ $(JAVAHFLAGS)
# 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 2009-02-05 08:40:51.000000000 +0000
-+++ openjdk-ecj/corba/make/org/omg/sources/Makefile 2009-02-10 19:24:54.000000000 +0000
+--- openjdk-ecj.orig/corba/make/org/omg/sources/Makefile 2009-03-20 11:54:59.000000000 +0000
++++ openjdk-ecj/corba/make/org/omg/sources/Makefile 2009-04-16 18:21:48.000000000 +0100
@@ -93,8 +93,6 @@
POAHELHOLFILES = $(POA_GENERATED_HELP_HOL_java:%=$(GENSRCDIR)/%)
@@ -234,8 +236,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 2009-02-10 18:11:57.000000000 +0000
-+++ openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile 2009-02-10 19:24:54.000000000 +0000
+--- openjdk-ecj.orig/corba/make/sun/rmi/corbalogsources/Makefile 2009-04-14 15:55:18.000000000 +0100
++++ openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile 2009-04-16 18:21:48.000000000 +0100
@@ -172,7 +172,6 @@
ACTIVATIONFILES = $(com_sun_corba_se_spi_activation_java:%=$(GENSRCDIR)/%)
@@ -253,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-02-10 18:12:00.000000000 +0000
-+++ openjdk-ecj/jaxp/make/build.xml 2009-02-10 19:24:54.000000000 +0000
+--- openjdk-ecj.orig/jaxp/make/build.xml 2009-04-16 15:16:30.000000000 +0100
++++ openjdk-ecj/jaxp/make/build.xml 2009-04-16 18:21:48.000000000 +0100
@@ -71,7 +71,10 @@
<mkdir dir="${build.toolclasses.dir}"/>
<javac srcdir="${make.tools.dir}/StripProperties"
@@ -277,8 +279,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 2009-02-10 18:12:00.000000000 +0000
-+++ openjdk-ecj/jaxp/make/Makefile 2009-02-10 19:24:54.000000000 +0000
+--- openjdk-ecj.orig/jaxp/make/Makefile 2009-04-16 15:16:30.000000000 +0100
++++ openjdk-ecj/jaxp/make/Makefile 2009-04-16 18:21:48.000000000 +0100
@@ -75,7 +75,7 @@
endif
@@ -289,8 +291,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-02-10 18:12:00.000000000 +0000
-+++ openjdk-ecj/jaxws/make/build.properties 2009-02-10 19:24:54.000000000 +0000
+--- openjdk-ecj.orig/jaxws/make/build.properties 2009-04-16 15:16:30.000000000 +0100
++++ openjdk-ecj/jaxws/make/build.properties 2009-04-16 18:21:48.000000000 +0100
@@ -37,7 +37,7 @@
# set the following to -version to verify the versions of javac being used
javac.version.opt =
@@ -301,8 +303,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-02-10 18:12:00.000000000 +0000
-+++ openjdk-ecj/jaxws/make/build.xml 2009-02-10 19:24:54.000000000 +0000
+--- openjdk-ecj.orig/jaxws/make/build.xml 2009-04-16 15:16:30.000000000 +0100
++++ openjdk-ecj/jaxws/make/build.xml 2009-04-16 18:21:48.000000000 +0100
@@ -84,7 +84,10 @@
<mkdir dir="${build.toolclasses.dir}"/>
<javac srcdir="${make.tools.dir}/StripProperties"
@@ -333,8 +335,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-02-10 18:12:00.000000000 +0000
-+++ openjdk-ecj/jaxws/make/Makefile 2009-02-10 19:24:54.000000000 +0000
+--- openjdk-ecj.orig/jaxws/make/Makefile 2009-04-16 15:16:30.000000000 +0100
++++ openjdk-ecj/jaxws/make/Makefile 2009-04-16 18:21:48.000000000 +0100
@@ -75,8 +75,8 @@
endif
@@ -347,8 +349,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 2009-02-05 08:44:12.000000000 +0000
-+++ openjdk-ecj/jdk/make/common/BuildToolJar.gmk 2009-02-10 19:24:54.000000000 +0000
+--- openjdk-ecj.orig/jdk/make/common/BuildToolJar.gmk 2009-03-20 11:58:37.000000000 +0000
++++ openjdk-ecj/jdk/make/common/BuildToolJar.gmk 2009-04-16 18:21:48.000000000 +0100
@@ -43,7 +43,8 @@
@$(prep-target)
@$(MKDIR) -p $(BUILDTOOLCLASSDIR)
@@ -360,8 +362,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-02-10 18:12:01.000000000 +0000
-+++ openjdk-ecj/jdk/make/common/Release.gmk 2009-02-10 19:24:54.000000000 +0000
+--- openjdk-ecj.orig/jdk/make/common/Release.gmk 2009-04-16 15:16:31.000000000 +0100
++++ openjdk-ecj/jdk/make/common/Release.gmk 2009-04-16 18:21:48.000000000 +0100
@@ -651,10 +651,23 @@
$(RES_JAR_ARGLIST): $(RES_JAR_FILELIST)
$(prep-target)
@@ -447,8 +449,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 2009-02-05 08:44:12.000000000 +0000
-+++ openjdk-ecj/jdk/make/common/Rules.gmk 2009-02-10 19:24:54.000000000 +0000
+--- openjdk-ecj.orig/jdk/make/common/Rules.gmk 2009-03-20 11:58:37.000000000 +0000
++++ openjdk-ecj/jdk/make/common/Rules.gmk 2009-04-16 18:21:48.000000000 +0100
@@ -237,8 +237,9 @@
$(ECHO) "# Java sources to be compiled: (listed in file $<)"; \
$(CAT) $<.filtered; \
@@ -475,14 +477,17 @@ 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-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 @@
+--- openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk 2009-04-16 15:16:30.000000000 +0100
++++ openjdk-ecj/jdk/make/common/shared/Defs-java.gmk 2009-04-16 18:28:27.000000000 +0100
+@@ -129,33 +129,22 @@
JAVACFLAGS += $(OTHER_JAVACFLAGS)
# Needed for javah
-JAVAHFLAGS += -bootclasspath $(CLASSBINDIR)
+JAVAHFLAGS += -bootclasspath $(CLASSBINDIR):$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)
+
+ # Needed for JAVADOC and BOOT_JAVACFLAGS
+ NO_PROPRIETARY_API_WARNINGS = -XDignore.symbol.file=true
# Langtools
ifdef LANGTOOLS_DIST
@@ -510,8 +515,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-02-05 08:44:13.000000000 +0000
-+++ openjdk-ecj/jdk/make/java/nio/Makefile 2009-02-10 19:24:54.000000000 +0000
+--- openjdk-ecj.orig/jdk/make/java/nio/Makefile 2009-04-16 15:16:30.000000000 +0100
++++ openjdk-ecj/jdk/make/java/nio/Makefile 2009-04-16 18:21:48.000000000 +0100
@@ -31,7 +31,7 @@
PACKAGE = java.nio
LIBRARY = nio
@@ -522,8 +527,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 2009-02-05 08:44:13.000000000 +0000
-+++ openjdk-ecj/jdk/make/java/text/Makefile 2009-02-10 19:24:54.000000000 +0000
+--- openjdk-ecj.orig/jdk/make/java/text/Makefile 2009-03-20 11:58:37.000000000 +0000
++++ openjdk-ecj/jdk/make/java/text/Makefile 2009-04-16 18:21:48.000000000 +0100
@@ -80,8 +80,8 @@
-sourcepath $(TEXT_SRCDIR) \
$(TEXT_SOURCES)
@@ -536,8 +541,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 2009-02-05 08:44:12.000000000 +0000
-+++ openjdk-ecj/jdk/make/Makefile 2009-02-10 19:24:54.000000000 +0000
+--- openjdk-ecj.orig/jdk/make/Makefile 2009-03-20 11:58:37.000000000 +0000
++++ openjdk-ecj/jdk/make/Makefile 2009-04-16 18:21:48.000000000 +0100
@@ -239,7 +239,7 @@
all build:: sanity-all post-sanity-all
@@ -548,8 +553,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 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
+--- openjdk-ecj.orig/jdk/make/sun/awt/FILES_export_unix.gmk 2009-03-20 11:58:37.000000000 +0000
++++ openjdk-ecj/jdk/make/sun/awt/FILES_export_unix.gmk 2009-04-16 18:21:48.000000000 +0100
@@ -188,3 +188,5 @@
java/awt/dnd/DnDConstants.java \
sun/awt/CausedFocusEvent.java
@@ -557,9 +562,9 @@ 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 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 @@
+--- openjdk-ecj.orig/jdk/make/sun/awt/Makefile 2009-04-14 15:55:52.000000000 +0100
++++ openjdk-ecj/jdk/make/sun/awt/Makefile 2009-04-16 18:21:48.000000000 +0100
+@@ -400,10 +400,9 @@
COMPILEFONTCONFIG_JARFILE = $(BUILDTOOLJARDIR)/compilefontconfig.jar
$(LIBDIR)/%.bfc: $(FONTCONFIGS_SRC)/$(FONTCONFIGS_SRC_PREFIX)%.properties \
@@ -574,8 +579,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 2009-02-05 08:44:14.000000000 +0000
-+++ openjdk-ecj/jdk/make/sun/javazic/Makefile 2009-02-10 19:24:54.000000000 +0000
+--- openjdk-ecj.orig/jdk/make/sun/javazic/Makefile 2009-03-20 11:58:37.000000000 +0000
++++ openjdk-ecj/jdk/make/sun/javazic/Makefile 2009-04-16 18:21:48.000000000 +0100
@@ -62,7 +62,8 @@
$(WORKDIR)/$(MAPFILE): $(BUILDTOOLJARDIR)/javazic.jar $(TZFILES)
$(RM) -r $(@D)
@@ -587,8 +592,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 2009-02-05 08:44:14.000000000 +0000
-+++ openjdk-ecj/jdk/make/sun/text/Makefile 2009-02-10 19:24:54.000000000 +0000
+--- openjdk-ecj.orig/jdk/make/sun/text/Makefile 2009-03-20 11:58:37.000000000 +0000
++++ openjdk-ecj/jdk/make/sun/text/Makefile 2009-04-16 18:21:48.000000000 +0100
@@ -85,8 +85,9 @@
$(BOOT_JAVAC_CMD) -d $(TEXT_CLASSES) \
-sourcepath $(TEXT_SRCDIR) \
@@ -602,8 +607,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-02-10 18:12:01.000000000 +0000
-+++ openjdk-ecj/jdk/make/sun/xawt/Makefile 2009-02-10 19:24:54.000000000 +0000
+--- openjdk-ecj.orig/jdk/make/sun/xawt/Makefile 2009-04-16 15:16:31.000000000 +0100
++++ openjdk-ecj/jdk/make/sun/xawt/Makefile 2009-04-16 18:21:48.000000000 +0100
@@ -276,11 +276,7 @@
TEMPDIR_CLASSES = $(TEMPDIR)/classes
@@ -641,8 +646,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-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
+--- openjdk-ecj.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2009-04-16 15:15:29.000000000 +0100
++++ openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2009-04-16 18:21:48.000000000 +0100
@@ -647,9 +647,6 @@
throws FileNotFoundException, IOException {
BufferedReader in = new BufferedReader(new FileReader(theTemplateFileName));
@@ -662,8 +667,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-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
+--- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Double.java 2009-04-16 15:15:12.000000000 +0100
++++ openjdk-ecj/jdk/src/share/classes/java/lang/Double.java 2009-04-16 18:21:48.000000000 +0100
@@ -76,7 +76,7 @@
* {@code 0x1.fffffffffffffP+1023} and also equal to
* {@code Double.longBitsToDouble(0x7fefffffffffffffL)}.
@@ -692,8 +697,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-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
+--- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Float.java 2009-04-16 15:15:12.000000000 +0100
++++ openjdk-ecj/jdk/src/share/classes/java/lang/Float.java 2009-04-16 18:21:48.000000000 +0100
@@ -76,7 +76,7 @@
* {@code 0x1.fffffeP+127f} and also equal to
* {@code Float.intBitsToFloat(0x7f7fffff)}.
@@ -722,8 +727,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 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
+--- openjdk-ecj.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2009-03-20 11:58:43.000000000 +0000
++++ openjdk-ecj/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2009-04-16 18:21:48.000000000 +0100
@@ -27,6 +27,7 @@
#define OGLContext_h_Included
@@ -789,8 +794,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.xml openjdk-ecj/langtools/make/build.xml
---- 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
+--- openjdk-ecj.orig/langtools/make/build.xml 2009-03-20 11:58:59.000000000 +0000
++++ openjdk-ecj/langtools/make/build.xml 2009-04-16 18:21:48.000000000 +0100
@@ -502,7 +502,9 @@
includes="@{includes}"
sourcepath=""
@@ -824,8 +829,8 @@ 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-02-10 18:12:00.000000000 +0000
-+++ openjdk-ecj/langtools/make/Makefile 2009-02-10 19:24:54.000000000 +0000
+--- openjdk-ecj.orig/langtools/make/Makefile 2009-04-16 15:16:30.000000000 +0100
++++ openjdk-ecj/langtools/make/Makefile 2009-04-16 18:21:48.000000000 +0100
@@ -112,7 +112,7 @@
ifdef ALT_BOOTDIR
@@ -836,8 +841,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-02-10 18:12:00.000000000 +0000
-+++ openjdk-ecj/make/jdk-rules.gmk 2009-02-10 19:24:54.000000000 +0000
+--- openjdk-ecj.orig/make/jdk-rules.gmk 2009-04-16 15:16:30.000000000 +0100
++++ openjdk-ecj/make/jdk-rules.gmk 2009-04-16 18:21:48.000000000 +0100
@@ -58,7 +58,7 @@
endif
diff -r bf7c34ac17a5 -r 1fe13f115ab0 patches/icedtea-alpha-fixes.patch
--- a/patches/icedtea-alpha-fixes.patch Fri Mar 20 11:57:47 2009 +0000
+++ b/patches/icedtea-alpha-fixes.patch Wed Apr 22 16:53:21 2009 +0100
@@ -1,6 +1,6 @@ diff -Nru openjdk.orig/corba/make/common
diff -Nru openjdk.orig/corba/make/common/Defs-linux.gmk openjdk/corba/make/common/Defs-linux.gmk
---- openjdk.orig/corba/make/common/Defs-linux.gmk 2008-09-01 01:43:43.000000000 +0100
-+++ openjdk/corba/make/common/Defs-linux.gmk 2008-09-01 01:45:15.000000000 +0100
+--- openjdk.orig/corba/make/common/Defs-linux.gmk 2009-04-15 15:39:27.000000000 +0100
++++ openjdk/corba/make/common/Defs-linux.gmk 2009-04-15 16:07:19.000000000 +0100
@@ -176,7 +176,8 @@
CXXFLAGS_DBG += $(CC_LOWER_OPT)
endif
@@ -12,8 +12,8 @@ diff -Nru openjdk.orig/corba/make/common
ifeq ($(ARCH_DATA_MODEL), 64)
diff -Nru openjdk.orig/hotspot/agent/src/os/linux/Makefile openjdk/hotspot/agent/src/os/linux/Makefile
---- openjdk.orig/hotspot/agent/src/os/linux/Makefile 2008-09-01 01:43:43.000000000 +0100
-+++ openjdk/hotspot/agent/src/os/linux/Makefile 2008-09-01 01:45:15.000000000 +0100
+--- openjdk.orig/hotspot/agent/src/os/linux/Makefile 2009-04-15 15:39:27.000000000 +0100
++++ openjdk/hotspot/agent/src/os/linux/Makefile 2009-04-15 16:07:19.000000000 +0100
@@ -40,7 +40,7 @@
LIBS = -lthread_db
@@ -33,9 +33,9 @@ diff -Nru openjdk.orig/hotspot/agent/src
test: test.o
$(GCC) -o test test.o -L$(ARCH) -lsaproc $(LIBS)
More information about the distro-pkg-dev
mailing list