From a16b7a1c066bbc365d32d86613507a688ec736e6 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Fri, 2 May 2008 08:16:49 +0000
Subject: libtool-2.2.2: Add fix for patch from upstream

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4405 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../libtool-2.2.2/Use-AC_CHECK_TOOL-for-otool-and-otool64.patch       | 4 ++--
 meta/packages/libtool/libtool-cross_2.2.2.bb                          | 2 +-
 meta/packages/libtool/libtool-native_2.2.2.bb                         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'meta/packages/libtool')

diff --git a/meta/packages/libtool/libtool-2.2.2/Use-AC_CHECK_TOOL-for-otool-and-otool64.patch b/meta/packages/libtool/libtool-2.2.2/Use-AC_CHECK_TOOL-for-otool-and-otool64.patch
index c8bb6577ab..4e69e2ccec 100644
--- a/meta/packages/libtool/libtool-2.2.2/Use-AC_CHECK_TOOL-for-otool-and-otool64.patch
+++ b/meta/packages/libtool/libtool-2.2.2/Use-AC_CHECK_TOOL-for-otool-and-otool64.patch
@@ -37,11 +37,11 @@ Index: libtool-2.2.2/libltdl/config/ltmain.m4sh
  		      depdepl="$absdir/$objdir/$depdepl"
 -		      darwin_install_name=`otool -L $depdepl | $SED -n -e '3q;2,2p' | $SED -e 's/(.*//'`
 -		      darwin_install_name=`$ECHO $darwin_install_name`
-+		      darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}`
++		      darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
                        if test -z "$darwin_install_name"; then
 -                          darwin_install_name=`otool64 -L $depdepl | $SED -n -e '3q;2,2p' | $SED -e 's/(.*//'`
 -                          darwin_install_name=`$ECHO $darwin_install_name`
-+                          darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}`
++                          darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
                        fi
  		      compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
  		      linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
diff --git a/meta/packages/libtool/libtool-cross_2.2.2.bb b/meta/packages/libtool/libtool-cross_2.2.2.bb
index 31b6af2c16..797aca827d 100644
--- a/meta/packages/libtool/libtool-cross_2.2.2.bb
+++ b/meta/packages/libtool/libtool-cross_2.2.2.bb
@@ -1,7 +1,7 @@
 require libtool.inc
 require libtool_${PV}.bb
 
-PR = "r18"
+PR = "r19"
 PACKAGES = ""
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
 SRC_URI_append = " file://cross_compile.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 59d9ecadbb..5b632c8a2e 100644
--- a/meta/packages/libtool/libtool-native_2.2.2.bb
+++ b/meta/packages/libtool/libtool-native_2.2.2.bb
@@ -1,7 +1,7 @@
 require libtool.inc
 require libtool_${PV}.bb
 
-PR = "r16"
+PR = "r17"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
 SRC_URI_append = " file://cross_compile.patch;patch=1 \
                    file://prefix.patch;patch=1"
-- 
cgit v1.2.3-54-g00ecf