From 15b539544443a7814cfc3a50e9c25015b462f236 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Mon, 30 Nov 2009 12:08:39 +0000
Subject: libtool: Only apply sysroot mangling to libtool itself (not
 native/cross/nativesdk)

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 meta/packages/libtool/libtool-cross_2.2.6.bb     |  2 +-
 meta/packages/libtool/libtool-native_2.2.6.bb    |  2 +-
 meta/packages/libtool/libtool-nativesdk_2.2.6.bb |  2 +-
 meta/packages/libtool/libtool_2.2.6.bb           | 12 ++++++------
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'meta/packages/libtool')

diff --git a/meta/packages/libtool/libtool-cross_2.2.6.bb b/meta/packages/libtool/libtool-cross_2.2.6.bb
index 6fefd02bb..2005e9833 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 = "r25"
+PR = "r26"
 PACKAGES = ""
 SRC_URI_append = " file://cross_compile.patch;patch=1 \
                    file://prefix.patch;patch=1"
diff --git a/meta/packages/libtool/libtool-native_2.2.6.bb b/meta/packages/libtool/libtool-native_2.2.6.bb
index 5d813b521..03db06c58 100644
--- a/meta/packages/libtool/libtool-native_2.2.6.bb
+++ b/meta/packages/libtool/libtool-native_2.2.6.bb
@@ -1,6 +1,6 @@
 require libtool_${PV}.bb
 
-PR = "r19"
+PR = "r20"
 SRC_URI_append = " file://cross_compile.patch;patch=1 \
                    file://prefix.patch;patch=1"
 
diff --git a/meta/packages/libtool/libtool-nativesdk_2.2.6.bb b/meta/packages/libtool/libtool-nativesdk_2.2.6.bb
index 537647cba..96978f4cc 100644
--- a/meta/packages/libtool/libtool-nativesdk_2.2.6.bb
+++ b/meta/packages/libtool/libtool-nativesdk_2.2.6.bb
@@ -1,6 +1,6 @@
 require libtool_${PV}.bb
 
-PR = "r0"
+PR = "r1"
 SRC_URI_append = " file://cross_compile.patch;patch=1"
 
 inherit nativesdk
diff --git a/meta/packages/libtool/libtool_2.2.6.bb b/meta/packages/libtool/libtool_2.2.6.bb
index f3228c28f..7f5f36ce1 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 = "r16"
+PR = "r17"
 
 SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}a.tar.gz \
            file://dolt.m4"
@@ -15,15 +15,15 @@ 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}/${bindir}/*
-	rm -rf ${SYSROOT_DESTDIR}/${datadir}/aclocal/*
-	rm -rf ${SYSROOT_DESTDIR}/${datadir}/libtool/config/*
+	if [ "${PN}" == "libtool" ]; then
+		rm -rf ${SYSROOT_DESTDIR}/${bindir}/*
+		rm -rf ${SYSROOT_DESTDIR}/${datadir}/aclocal/*
+		rm -rf ${SYSROOT_DESTDIR}/${datadir}/libtool/config/*
+	fi
 }
-- 
cgit v1.2.3