summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-11-30 12:08:39 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-11-30 12:08:39 +0000
commit15b539544443a7814cfc3a50e9c25015b462f236 (patch)
tree281c4f05a3969a2dc49a41ff71aa4e3a3d68e7e6 /meta
parent35433abab3365cef5182684811e221c46ea9a31e (diff)
downloadopenembedded-core-15b539544443a7814cfc3a50e9c25015b462f236.tar.gz
openembedded-core-15b539544443a7814cfc3a50e9c25015b462f236.tar.bz2
openembedded-core-15b539544443a7814cfc3a50e9c25015b462f236.tar.xz
openembedded-core-15b539544443a7814cfc3a50e9c25015b462f236.zip
libtool: Only apply sysroot mangling to libtool itself (not native/cross/nativesdk)
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/libtool/libtool-cross_2.2.6.bb2
-rw-r--r--meta/packages/libtool/libtool-native_2.2.6.bb2
-rw-r--r--meta/packages/libtool/libtool-nativesdk_2.2.6.bb2
-rw-r--r--meta/packages/libtool/libtool_2.2.6.bb12
4 files changed, 9 insertions, 9 deletions
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
}