[RFC] PR1118: Synchronize CACAO sections with icedtea7

[Stefan Ring]

> Ok, so I suggest just adding a patch to change the test & add parallel
> jobs, assuming it builds.

Ok, I have this now --
<https://bitbucket.org/Ringdingcoder/icedtea6/changeset/cc637d1a7aa844ba468fe76c522613f4b91df0dd>:


diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-09-25  Stefan Ring  <stefan at complang.tuwien.ac.at>
+
+	* Makefile.am: Synchronize CACAO sections with icedtea7,
+	remove test-disabling patches.
+	* patches/cacao/ignore-jdi-tests.patch: Removed.
+	* patches/cacao/ignore-tests.patch: Removed.
+
 2012-09-20  Andrew John Hughes  <gnu.andrew at redhat.com>

 	* Makefile.am:
diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -453,12 +453,6 @@
 	patches/cacao/memory.patch
 endif

-if ENABLE_CACAO
-ICEDTEA_PATCHES += \
-	patches/cacao/ignore-jdi-tests.patch \
-	patches/cacao/ignore-tests.patch
-endif
-
 if ENABLE_PULSE_JAVA
 ICEDTEA_PATCHES += \
 	patches/pulse-soundproperties.patch
@@ -1054,7 +1048,7 @@
 endif
 endif
 	mkdir -p stamps
-	touch stamps/extract-cacao.stamp
+	touch $@

 stamps/extract-jamvm.stamp:
 if BUILD_JAMVM
@@ -2112,7 +2106,7 @@
 	  --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \
 	  --with-java-runtime-library-classes=$(RUNTIME) \
 	  --enable-jre-layout $(CACAO_CONFIGURE_ARGS); \
-	$(ARCH_PREFIX) $(MAKE) install
+	$(ARCH_PREFIX) $(MAKE) -j$(PARALLEL_JOBS) install
 	ln -s server $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/client
 endif
 endif