libtool: Only apply sysroot mangling to libtool itself (not native/cross/nativesdk)

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

diff --git a/meta/packages/libtool/libtool-cross_2.2.6.bb b/meta/packages/libtool/libtool-cross_2.2.6.bb
index 6fefd02bb52f453f63d97114d20dee3a4a66cf08..2005e98339d7281fb4493f91ad60267a2f369af1 100644 (file)
--- 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 5d813b5211a5f436c7f8b8f93ce9ede699329bd2..03db06c58fa16e14ce962334dedd02ad710944f7 100644 (file)
--- 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 537647cbacd13614e38d1cda63516c6c0fae4db8..96978f4ccbf4fbc92fc0336067d42f6560222d54 100644 (file)
--- 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 f3228c28fe7ce4a9eeb4b356bb9e531120c06412..7f5f36ce1964a23da1113639b4f936c0b853777e 100644 (file)
--- 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
 }