RFC: move patches/headers-hotspot.patch to patches/ecj/

[Dr Andrew John Hughes]

On 18:29 Thu 05 May     , Omair Majid wrote:
> Hi,
> 
>  From what I can tell, patches/headers-hotspot.patch and the associated 
> Makefile.am declerations are only needed during bootstrap (to make sure 
> a proper XML implementation is available). After OpenJDK has been built 
> once, the JDK's build-in implementation should be more than sufficient 
> to perform needed tasks. I have been testing the attached patch and it 
> works fine with and without --disable bootstrap.
> 
> Does anyone have any thoughts about this?
> 
> ChangeLog:
> 2011-05-05  Omair Majid  <omajid at redhat.com>
> 
>    * Makefile.am
>    (ICEDTEA_PATCHES): Move headers-hotspot.patch to ...
>    (ICEDTEA_ECJ_PATCHES): Here.
>    (ICEDTEA_ENV): Moves endorsed dir varaibles to ...
>    (ICEDTEA_ENV_ECJ): Here.
>    * patches/headers-hotspot.patch: Move to ...
>    * patches/ecj/headers-hotspot.patch: New file.
> 
> Cheers,
> Omair

Yes, these look like bootstrap patches that have been wrongly placed eons
ago.  Please apply this.  Can you also do a similar change for 7?  The fragment
is part of headers.patch there and needs to be split and placed in patches/boot.

> diff -r 2afcd8dd14a0 Makefile.am
> --- a/Makefile.am	Wed May 04 16:22:47 2011 -0400
> +++ b/Makefile.am	Thu May 05 18:15:05 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 \
> @@ -414,6 +413,7 @@
>  
>  ICEDTEA_ECJ_PATCHES = patches/ecj/icedtea.patch \
>  	patches/ecj/hotspot.patch \
> +	patches/ecj/headers-hotspot.patch \
>  	patches/ecj/spp.patch \
>  	patches/ecj/jopt.patch \
>  	patches/ecj/jaxp-dependency.patch \
> @@ -474,8 +474,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)" \
> @@ -557,6 +555,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 2afcd8dd14a0 patches/ecj/headers-hotspot.patch
> --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
> +++ b/patches/ecj/headers-hotspot.patch	Thu May 05 18:15:05 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 2afcd8dd14a0 patches/headers-hotspot.patch
> --- a/patches/headers-hotspot.patch	Wed May 04 16:22:47 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
> - 
> -


-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: F5862A37 (https://keys.indymedia.org/)
Fingerprint = EA30 D855 D50F 90CD F54D  0698 0713 C3ED F586 2A37