/hg/icedtea6: Only use non-jdk xml parsers for bootstrap

[omajid at icedtea.classpath.org]

changeset d8750486e54c in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d8750486e54c
author: Omair Majid <omajid at redhat.com>
date: Wed May 11 20:27:41 2011 -0400

	Only use non-jdk xml parsers for bootstrap

	This patch moves patches/headers-hotspot.patch to patches/ecj
	/endorsed-dir-for-jvmti.patch and only applies it on a bootstrap
	build. The xerces/xalan parsers should only be required for
	bootstrap builds. OpenJDK's built-in xml parsers are good enough to
	handle the rest of the build.

	2011-05-11 Omair Majid <omajid at redhat.com>

	 * Makefile.am (ICEDTEA_PATCHES): Move headers-hotspot.patch
	to ... (ICEDTEA_ECJ_PATCHES): New patch. (ICEDTEA_ENV):
	Moves endorsed dir varaibles to ... (ICEDTEA_ENV_ECJ): Here.
	    * patches/headers-hotspot.patch: Move to ...
	    * patches/ecj/endorsed-dir-for-jvmti.patch: New file.


diffstat:

 ChangeLog                                |  10 ++++++++++
 Makefile.am                              |   6 +++---
 patches/ecj/endorsed-dir-for-jvmti.patch |  12 ++++++++++++
 patches/headers-hotspot.patch            |  12 ------------
 4 files changed, 25 insertions(+), 15 deletions(-)

diffs (88 lines):

diff -r 439a9cd78f8c -r d8750486e54c ChangeLog
--- a/ChangeLog	Wed May 11 13:11:03 2011 -0400
+++ b/ChangeLog	Wed May 11 20:27:41 2011 -0400
@@ -1,3 +1,13 @@
+2011-05-11  Omair Majid  <omajid at redhat.com>
+
+	* Makefile.am
+	(ICEDTEA_PATCHES): Move headers-hotspot.patch to ...
+	(ICEDTEA_ECJ_PATCHES): New patch.
+	(ICEDTEA_ENV): Moves endorsed dir varaibles to ...
+	(ICEDTEA_ENV_ECJ): Here.
+	* patches/headers-hotspot.patch: Move to ...
+	* patches/ecj/endorsed-dir-for-jvmti.patch: New file.
+
 2011-05-11  Omair Majid  <omajid at redhat.com>
 
 	Backport S7042040: Remove disk space sanity check
diff -r 439a9cd78f8c -r d8750486e54c Makefile.am
--- a/Makefile.am	Wed May 11 13:11:03 2011 -0400
+++ b/Makefile.am	Wed May 11 20:27:41 2011 -0400
@@ -221,7 +221,6 @@
 	patches/tools.patch \
 	patches/use-system-tzdata.patch \
 	patches/headers.patch \
-	patches/headers-hotspot.patch \
 	patches/gcc-suffix.patch \
 	patches/hotspot/$(HSBUILD)/gcc-suffix.patch \
 	patches/memory-limits.patch \
@@ -415,6 +414,7 @@
 
 ICEDTEA_ECJ_PATCHES = patches/ecj/icedtea.patch \
 	patches/ecj/hotspot.patch \
+	patches/ecj/endorsed-dir-for-jvmti.patch \
 	patches/ecj/spp.patch \
 	patches/ecj/jopt.patch \
 	patches/ecj/jaxp-dependency.patch \
@@ -475,8 +475,6 @@
 	ALT_BOOTDIR="$(BOOT_DIR)" \
 	BUILD_ARCH_DIR="$(BUILD_ARCH_DIR)" \
 	ICEDTEA_CLS_DIR="$(ICEDTEA_CLS_DIR)" \
-	ICEDTEA_ENDORSED_DIR="$(ENDORSED_DIR)" \
-	ENDORSED="-Djava.endorsed.dirs=$(ENDORSED_DIR)" \
 	CLASSPATH="" \
 	LD_LIBRARY_PATH="" \
 	ZERO_BUILD="$(ICEDTEA_ZERO_BUILD)" \
@@ -558,6 +556,8 @@
 	BOOTCLASSPATH_CLS="-bootclasspath $(ICEDTEA_CLS_DIR_ECJ)" \
 	BOOTCLASSPATH_RT_LIBGCJ="-bootclasspath $(RUNTIME)" \
 	CLASSPATH="" \
+	ICEDTEA_ENDORSED_DIR="$(ENDORSED_DIR)" \
+	ENDORSED="-Djava.endorsed.dirs=$(ENDORSED_DIR)" \
 	LD_LIBRARY_PATH="" \
 	GENSRCDIR="$(abs_top_builddir)/generated" \
 	JAR_KNOWS_ATFILE="$(JAR_KNOWS_ATFILE)" \
diff -r 439a9cd78f8c -r d8750486e54c patches/ecj/endorsed-dir-for-jvmti.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ecj/endorsed-dir-for-jvmti.patch	Wed May 11 20:27:41 2011 -0400
@@ -0,0 +1,13 @@
+diff -Nru openjdk.orig/hotspot/make/linux/makefiles/jvmti.make openjdk/hotspot/make/linux/makefiles/jvmti.make
+--- openjdk-ecj.orig/hotspot/make/linux/makefiles/jvmti.make	2008-05-23 20:51:14.000000000 +0100
++++ openjdk-ecj/hotspot/make/linux/makefiles/jvmti.make	2008-05-23 20:54:13.000000000 +0100
+@@ -59,7 +59,7 @@
+ 
+ JvmtiGeneratedFiles = $(JvmtiGeneratedNames:%=$(JvmtiOutDir)/%)
+ 
+-XSLT = $(QUIETLY) $(REMOTE) $(RUN.JAVA) -classpath $(JvmtiOutDir) jvmtiGen
++XSLT = $(QUIETLY) $(REMOTE) $(RUN.JAVA) $(ENDORSED) -classpath $(JvmtiOutDir) jvmtiGen
+ 
+ .PHONY: all jvmtidocs clean cleanall
+ 
+
diff -r 439a9cd78f8c -r d8750486e54c patches/headers-hotspot.patch
--- a/patches/headers-hotspot.patch	Wed May 11 13:11:03 2011 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-diff -Nru openjdk.orig/hotspot/make/linux/makefiles/jvmti.make openjdk/hotspot/make/linux/makefiles/jvmti.make
---- openjdk.orig/hotspot/make/linux/makefiles/jvmti.make	2008-05-23 20:51:14.000000000 +0100
-+++ openjdk/hotspot/make/linux/makefiles/jvmti.make	2008-05-23 20:54:13.000000000 +0100
-@@ -59,7 +59,7 @@
- 
- JvmtiGeneratedFiles = $(JvmtiGeneratedNames:%=$(JvmtiOutDir)/%)
- 
--XSLT = $(QUIETLY) $(REMOTE) $(RUN.JAVA) -classpath $(JvmtiOutDir) jvmtiGen
-+XSLT = $(QUIETLY) $(REMOTE) $(RUN.JAVA) $(ENDORSED) -classpath $(JvmtiOutDir) jvmtiGen
- 
- .PHONY: all jvmtidocs clean cleanall
- 
-