[oe] [PATCH 03/12][oe-classic] cacao-native: update hg version

[Henning Heinold]

* fixes segfaults and remove shutdownguard-patch, which is applied upstream
* remove the pre-generated libtool files

Signed-off-by: Henning Heinold <heinold at inf.fu-berlin.de>
---
 recipes/cacao/cacao-native.inc   |   13 +++++++++++++
 recipes/cacao/cacao-native_hg.bb |    8 +++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/recipes/cacao/cacao-native.inc b/recipes/cacao/cacao-native.inc
index fc86e68..8501634 100644
--- a/recipes/cacao/cacao-native.inc
+++ b/recipes/cacao/cacao-native.inc
@@ -34,3 +34,16 @@ export JAVAC="${STAGING_BINDIR_NATIVE}/ecj-initial"
 
 # force usage of fastjar
 export JAR="fastjar"
+
+do_configure_prepend () {
+        # Remove old libtool macros.
+        MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"
+        for i in ${MACROS}; do
+               rm -f src/mm/boehm-gc/m4/$i
+               rm -f m4/$i
+        done
+	rm  ltmain.sh
+	rm  libtool
+	rm  src/mm/boehm-gc/ltmain.sh
+	rm  src/mm/boehm-gc/libtool
+}
diff --git a/recipes/cacao/cacao-native_hg.bb b/recipes/cacao/cacao-native_hg.bb
index 020dee3..9413633 100644
--- a/recipes/cacao/cacao-native_hg.bb
+++ b/recipes/cacao/cacao-native_hg.bb
@@ -1,11 +1,9 @@
 require cacao-native.inc
 
 PV = "1.1.0+hgr${SRCPV}"
-PR = "r5"
+PR = "r6"
 
-SRCREV = "c7bf150bfa46"
-SRC_URI = "hg://mips.complang.tuwien.ac.at/hg/;module=cacao;rev=${SRCREV} \
-           file://cacao-shutdownguard.patch \
-          "
+SRCREV = "cff92704c4e0"
+SRC_URI = "hg://mips.complang.tuwien.ac.at/hg/;module=cacao;rev=${SRCREV}" 
 
 S = "${WORKDIR}/cacao"
-- 
1.7.9