[patch] update patches/boot/gest_gamma.patch for shark

[Dr Andrew John Hughes]

On 15:06 Tue 19 Apr     , Omair Majid wrote:
> Hi,
> 
> The attached patch disables the gamma tests when a bootstrapped sharked 
> is being built. Without this patch gamma cant find libjava.so which will 
> cause the build to fail. Okay to commit?
> 
> Cheers,
> Omair

Looks fine, except you're missing a ChangeLog :-)

FYI: In general, for IcedTea7, bootstrap patches like this go in the IcedTea7
repository (as you've done here) while we try to add mainstream patches into
the forest for easier maintenance.

> diff -r 8f9c35e54e17 patches/boot/test_gamma.patch
> --- a/patches/boot/test_gamma.patch	Tue Apr 19 15:35:23 2011 +0100
> +++ b/patches/boot/test_gamma.patch	Tue Apr 19 15:03:14 2011 -0400
> @@ -1,7 +1,7 @@
>  diff -Nru ../openjdk.orig/openjdk-boot/hotspot/make/linux/Makefile openjdk-boot/hotspot/make/linux/Makefile
>  --- ../openjdk.orig/openjdk-boot/hotspot/make/linux/Makefile	2009-10-30 17:37:07.000000000 +0000
>  +++ openjdk-boot/hotspot/make/linux/Makefile	2009-10-30 17:45:40.000000000 +0000
> -@@ -287,35 +287,30 @@
> +@@ -287,42 +287,36 @@
>   
>   $(TARGETS_C2):  $(SUBDIRS_C2)
>   	cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
> @@ -37,3 +37,11 @@
>   ifdef INSTALL
>   	cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install
>   endif
> + 
> + $(TARGETS_SHARK):  $(SUBDIRS_SHARK)
> +    cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS)
> +-   cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && ./test_gamma
> + ifdef INSTALL
> +    cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install
> + endif
> + 


-- 
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