From 0f331d1d84b7a36aabe016198992642bc61f49bc Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Fri, 11 Apr 2008 11:32:22 +0000
Subject: libtool-cross: Enable using dolt for the cases where it works, work
 around broken libtool fallback handling

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4230 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/libtool/libtool-cross_1.5.10.bb | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'meta/packages/libtool/libtool-cross_1.5.10.bb')

diff --git a/meta/packages/libtool/libtool-cross_1.5.10.bb b/meta/packages/libtool/libtool-cross_1.5.10.bb
index 0d0b90ac8..7029a3d0a 100644
--- a/meta/packages/libtool/libtool-cross_1.5.10.bb
+++ b/meta/packages/libtool/libtool-cross_1.5.10.bb
@@ -1,7 +1,7 @@
 require libtool.inc
 require libtool_${PV}.bb
 
-PR = "r10"
+PR = "r11"
 PACKAGES = ""
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
 SRC_URI_append = " file://libdir-la.patch;patch=1 \
@@ -12,6 +12,13 @@ SRC_URI_append = " file://libdir-la.patch;patch=1 \
 		   file://nmedit_fix.patch;patch=1 \
 		   file://nousrlib.patch;patch=1"
 
+DOLT_PATCH = ""
+DOLT_PATCH_arm = " file://add_dolt.patch;patch=1"
+DOLT_PATCH_i586 = " file://add_dolt.patch;patch=1"
+
+SRC_URI_append_linux = "${DOLT_PATCH}"
+SRC_URI_append_linux-gnueabi = "${DOLT_PATCH}"
+
 S = "${WORKDIR}/libtool-${PV}"
 
 prefix = "${STAGING_DIR_NATIVE}${layout_prefix}"
@@ -41,6 +48,7 @@ do_stage () {
         install -c -m 0644 ltmain.sh ${STAGING_DATADIR}/libtool/
         install -c -m 0644 libtool.m4 ${STAGING_DATADIR}/aclocal/
         install -c -m 0644 ltdl.m4 ${STAGING_DATADIR}/aclocal/
+        install -c -m 0644 ${WORKDIR}/dolt.m4 ${STAGING_DATADIR}/aclocal/
 }
 
 do_install () {
-- 
cgit v1.2.3