Fix Cacao patch in icedtea7

[Gary Benson]

Hi all,

This commit makes cacao/arch.patch apply correctly after my earlier
removal of one of the dead Zero patches.  Note that cacao/arch.patch
is adding a bunch of stuff for Cacao that is not required for Zero
and so is probably not required for Cacao either, ie the patch is
probably redundant.  But it's not mine to remove...

Cheers,
Gary

-- 
http://gbenson.net/
-------------- next part --------------
diff -r 2deccfc8b64f -r 8593cf8e0cf0 ChangeLog
--- a/ChangeLog	Thu Dec 03 16:39:28 2009 +0000
+++ b/ChangeLog	Thu Dec 03 17:11:25 2009 +0000
@@ -1,3 +1,7 @@
+2009-12-03  Gary Benson  <gbenson at redhat.com>
+
+	* patches/cacao/arch.patch: Fix up.
+
 2009-12-03  Gary Benson  <gbenson at redhat.com>
 
 	* patches/icedtea-core-build.patch: Removed.
diff -r 2deccfc8b64f -r 8593cf8e0cf0 patches/cacao/arch.patch
--- a/patches/cacao/arch.patch	Thu Dec 03 16:39:28 2009 +0000
+++ b/patches/cacao/arch.patch	Thu Dec 03 17:11:25 2009 +0000
@@ -48,8 +48,8 @@
 --- openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk	2009-07-24 00:15:26.000000000 +0100
 +++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk	2009-07-24 00:19:32.000000000 +0100
 @@ -71,6 +71,52 @@
-     REQUIRED_CC_VER = 3.2
-     REQUIRED_GCC_VER = 3.2.*
+   else
+     CXX            = $(COMPILER_PATH)g++$(GCC_SUFFIX)
    endif
 +  ifeq ($(ARCH), alpha)
 +    # alpha