[PATCH 2 of 2] PR1120: Synchronize CACAO sections with icedtea6

[Stefan Ring]

# HG changeset patch
# User sr
# Date 1348514527 -7200
# Node ID e7c6c340dedeab1fbf677f5c7c9780596bd5f764
# Parent  df433f22394fccfedf8853e17e29cd66ebc0dc37
PR1120: Synchronize CACAO sections with icedtea6

diff -r df433f22394f -r e7c6c340dede Makefile.am
--- a/Makefile.am	Sun Sep 02 09:18:35 2012 +0200
+++ b/Makefile.am	Mon Sep 24 21:22:07 2012 +0200
@@ -270,11 +270,6 @@
 endif
 endif
 
-if ENABLE_CACAO
-ICEDTEA_PATCHES += \
-	patches/cacao/ignore-tests.patch
-endif
-
 if BUILD_JAMVM
 ICEDTEA_PATCHES += \
 	patches/jamvm/remove-sun.misc.Perf-debug-code.patch
@@ -377,16 +372,8 @@
 if JAVAC_LACKS_DIAMOND
 ICEDTEA_BOOT_PATCHES += patches/boot/ecj-diamond.patch
 else
-if USING_CACAO
-ICEDTEA_BOOT_PATCHES += patches/boot/compile-for-7-cacao-mem.patch
-else
-if BUILD_CACAO
-ICEDTEA_BOOT_PATCHES += patches/boot/compile-for-7-cacao-mem.patch
-else
 ICEDTEA_BOOT_PATCHES += patches/boot/compile-for-7.patch
 endif
-endif
-endif
 
 if DTDTYPE_QNAME
 ICEDTEA_BOOT_PATCHES += patches/boot/jaxws-getdtdtype.patch
@@ -473,11 +460,6 @@
 	JAVAC_WARNINGS_FATAL="$(WERROR_STATUS)" \
 	COMPILER_WARNINGS_FATAL="$(WERROR_STATUS)"
 
-if ENABLE_CACAO
-ICEDTEA_ENV += \
-	ALT_HOTSPOT_IMPORT_PATH="$(CACAO_IMPORT_PATH)"
-endif
-
 if ENABLE_JAMVM
 ICEDTEA_ENV += \
 	ALT_HOTSPOT_IMPORT_PATH="$(JAMVM_IMPORT_PATH)"
@@ -1268,7 +1250,7 @@
 clean-sanitise-openjdk:
 	rm -f stamps/sanitise-openjdk.stamp
 
-stamps/extract-cacao.stamp: stamps/download-cacao.stamp
+stamps/extract-cacao.stamp:
 if BUILD_CACAO
 if !USE_SYSTEM_CACAO
 if USE_ALT_CACAO_SRC_DIR
@@ -1283,11 +1265,9 @@
 	if ! test -d cacao/cacao ; \
 	then \
 	  mkdir cacao ; \
-	  $(TAR) xzf $(CACAO_SRC_ZIP) -C cacao ; \
+	  $(TAR) xf $(CACAO_SRC_ZIP) -C cacao ; \
 	  dir=$$(basename cacao/cacao-*) ; \
 	  ln -s $$dir cacao/cacao ; \
-	  cd cacao/cacao ; \
-	  cd .. ; \
 	fi
 endif
 endif
@@ -2096,8 +2076,6 @@
 	  --enable-jre-layout $(CACAO_CONFIGURE_ARGS); \
 	$(ARCH_PREFIX) $(MAKE) -j$(PARALLEL_JOBS) install
 	ln -sf server $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/client
-	touch $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt
-	ln -sf client/libjvm.so $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/libjsig.so
 endif
 endif
 	mkdir -p stamps