/hg/icedtea: Update cacao patches to apply to updated OpenJDK so...

[omajid at icedtea.classpath.org]

changeset bf3fe6f6ddf4 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=bf3fe6f6ddf4
author: Omair Majid <omajid at redhat.com>
date: Thu Apr 21 13:20:10 2011 -0400

	Update cacao patches to apply to updated OpenJDK sources


diffstat:

 ChangeLog                        |  5 +++++
 patches/cacao/ignore-tests.patch |  2 +-
 patches/cacao/launcher.patch     |  2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diffs (36 lines):

diff -r 663791bf75c7 -r bf3fe6f6ddf4 ChangeLog
--- a/ChangeLog	Thu Apr 21 13:09:00 2011 -0400
+++ b/ChangeLog	Thu Apr 21 13:20:10 2011 -0400
@@ -1,3 +1,8 @@
+2011-04-21  Omair Majid  <omajid at redhat.com>
+
+	* patches/cacao/ignore-tests.patch: Update to apply on new sources.
+	* patches/cacao/launcher.patch: Likewise.
+
 2011-04-21  Omair Majid  <omajid at redhat.com>
 
 	* Makefile.am (clean-add-cacao): Fix typo.
diff -r 663791bf75c7 -r bf3fe6f6ddf4 patches/cacao/ignore-tests.patch
--- a/patches/cacao/ignore-tests.patch	Thu Apr 21 13:09:00 2011 -0400
+++ b/patches/cacao/ignore-tests.patch	Thu Apr 21 13:20:10 2011 -0400
@@ -2,7 +2,7 @@
 --- openjdk.orig/jdk/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java	2010-05-10 15:04:14.000000000 +0100
 +++ openjdk/jdk/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java	2010-05-10 23:42:41.000000000 +0100
 @@ -37,6 +37,7 @@
-  * @compile ProducerConsumerLoops.java
+  * @compile -source 1.5 ProducerConsumerLoops.java
   * @run main/timeout=3600 ProducerConsumerLoops
   * @summary  multiple producers and consumers using blocking queues
 + * @ignore cacao test hog, ignore for the sake of buildds
diff -r 663791bf75c7 -r bf3fe6f6ddf4 patches/cacao/launcher.patch
--- a/patches/cacao/launcher.patch	Thu Apr 21 13:09:00 2011 -0400
+++ b/patches/cacao/launcher.patch	Thu Apr 21 13:20:10 2011 -0400
@@ -30,7 +30,7 @@
  
        args.argc = argc;
 @@ -1931,7 +1935,17 @@
-       args.classname = classname;
+       args.what = what;
        args.ifn = *ifn;
  
 -      rslt = ContinueInNewThread0(JavaMain, threadStackSize, (void*)&args);