From 90e7d08446347304a9b8698cc0ca60c5218bdb81 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Tue, 22 Apr 2008 12:50:38 +0000
Subject: libtool: Disable a section of the libdir-la patch since its doing
 more harm than good. This should fix sdk .la files at the expense of having
 to mangle files being installed into staging

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4307 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/libtool/libtool-2.2.2/libdir-la.patch | 4 ++--
 meta/packages/libtool/libtool-cross_2.2.2.bb        | 3 ++-
 meta/packages/libtool/libtool-native_2.2.2.bb       | 3 ++-
 meta/packages/libtool/libtool_2.2.2.bb              | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/meta/packages/libtool/libtool-2.2.2/libdir-la.patch b/meta/packages/libtool/libtool-2.2.2/libdir-la.patch
index a726cb2b8c..761e69779a 100644
--- a/meta/packages/libtool/libtool-2.2.2/libdir-la.patch
+++ b/meta/packages/libtool/libtool-2.2.2/libdir-la.patch
@@ -49,8 +49,8 @@ Index: libtool-2.2.2/libltdl/config/ltmain.m4sh
  	    for deplib in $dependency_libs; do
 +              # Replacing uninstalled with installed can easily break crosscompilation,
 +              # since the installed path is generally the wrong architecture.  -CL
-+              newdependency_libs="$newdependency_libs $deplib"
-+              continue
++              # newdependency_libs="$newdependency_libs $deplib"
++              # continue
  	      case $deplib in
  	      *.la)
  		func_basename "$deplib"
diff --git a/meta/packages/libtool/libtool-cross_2.2.2.bb b/meta/packages/libtool/libtool-cross_2.2.2.bb
index 37643e5503..9c0b30ce5c 100644
--- a/meta/packages/libtool/libtool-cross_2.2.2.bb
+++ b/meta/packages/libtool/libtool-cross_2.2.2.bb
@@ -1,11 +1,12 @@
 require libtool.inc
 require libtool_${PV}.bb
 
-PR = "r12"
+PR = "r15"
 PACKAGES = ""
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
 SRC_URI_append = " file://libdir-la.patch;patch=1 \
                     file://prefix.patch;patch=1 \
+#                   file://sysroot.patch;patch=1 \
 #                   file://tag.patch;patch=1 \
 		   file://nousrlib.patch;patch=1"
 
diff --git a/meta/packages/libtool/libtool-native_2.2.2.bb b/meta/packages/libtool/libtool-native_2.2.2.bb
index 8b27424a6e..6b5f379318 100644
--- a/meta/packages/libtool/libtool-native_2.2.2.bb
+++ b/meta/packages/libtool/libtool-native_2.2.2.bb
@@ -1,10 +1,11 @@
 require libtool.inc
 require libtool_${PV}.bb
 
-PR = "r9"
+PR = "r11"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
 SRC_URI_append = " file://libdir-la.patch;patch=1 \
                    file://prefix.patch;patch=1 \
+#                   file://sysroot.patch;patch=1 \
 #                   file://tag.patch;patch=1 \
 		   file://nousrlib.patch;patch=1"
 
diff --git a/meta/packages/libtool/libtool_2.2.2.bb b/meta/packages/libtool/libtool_2.2.2.bb
index 0f727cd744..05f39fa370 100644
--- a/meta/packages/libtool/libtool_2.2.2.bb
+++ b/meta/packages/libtool/libtool_2.2.2.bb
@@ -1,6 +1,6 @@
 require libtool.inc
 
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
            file://uclibc.patch;patch=1 \
-- 
cgit v1.2.3