libtool: Don't install into staging since we need libtool-cross there

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

3 files changed, 14 insertions, 3 deletions

diff --git a/meta/packages/gtk+/gtk+_2.16.6.bb b/meta/packages/gtk+/gtk+_2.16.6.bb
index de10b1e1fe..becd2bc29c 100644
--- a/meta/packages/gtk+/gtk+_2.16.6.bb
+++ b/meta/packages/gtk+/gtk+_2.16.6.bb
@@ -1,6 +1,6 @@
 require gtk+.inc
 
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "http://download.gnome.org/sources/gtk+/2.16/gtk+-${PV}.tar.bz2 \
            file://xsettings.patch;patch=1 \
diff --git a/meta/packages/libtool/libtool-cross_2.2.6.bb b/meta/packages/libtool/libtool-cross_2.2.6.bb
index 7edefc9cd9..6fefd02bb5 100644
--- a/meta/packages/libtool/libtool-cross_2.2.6.bb
+++ b/meta/packages/libtool/libtool-cross_2.2.6.bb
@@ -1,6 +1,6 @@
 require libtool_${PV}.bb
 
-PR = "r24"
+PR = "r25"
 PACKAGES = ""
 SRC_URI_append = " file://cross_compile.patch;patch=1 \
                    file://prefix.patch;patch=1"
diff --git a/meta/packages/libtool/libtool_2.2.6.bb b/meta/packages/libtool/libtool_2.2.6.bb
index eb34e79c1b..a27693adda 100644
--- a/meta/packages/libtool/libtool_2.2.6.bb
+++ b/meta/packages/libtool/libtool_2.2.6.bb
@@ -1,6 +1,6 @@
 require libtool.inc
 
-PR = "r14"
+PR = "r15"
 
 SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}a.tar.gz \
            file://dolt.m4"
@@ -14,3 +14,14 @@ FILES_libltdl-dbg = "${libdir}/.debug/"
 inherit autotools_stage
 
 EXTRA_AUTORECONF = "--exclude=libtoolize"
+
+
+
+#
+# We want the results of libtool-cross preserved - don't stage anything ourselves.
+#
+SYSROOT_PREPROCESS_FUNCS += "libtool_sysroot_preprocess"
+
+libtool_sysroot_preprocess () {
+        rm -rf ${SYSROOT_DESTDIR}/*
+}
\ No newline at end of file