libtool-2.2.2: Add fixes for darwin, drop uclibc patch as it should no longer be needed

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4390 311d38ba-8fff-0310-9ca6-ca027cbcb966

3 files changed, 20 insertions, 3 deletions

diff --git a/meta/packages/libtool/libtool-2.2.2/darwin_fixes.patch b/meta/packages/libtool/libtool-2.2.2/darwin_fixes.patch
new file mode 100644
index 0000000000..766b520cf2
--- /dev/null
+++ b/meta/packages/libtool/libtool-2.2.2/darwin_fixes.patch
@@ -0,0 +1,17 @@
+Index: libtool-2.2.2/libltdl/config/ltmain.m4sh
+===================================================================
+--- libtool-2.2.2.orig/libltdl/config/ltmain.m4sh       2008-05-01 12:19:37.000000000 +0100
++++ libtool-2.2.2/libltdl/config/ltmain.m4sh    2008-05-01 12:29:05.000000000 +0100
+@@ -4965,10 +4965,10 @@
+                    done
+                    if test -f "$absdir/$objdir/$depdepl" ; then
+                      depdepl="$absdir/$objdir/$depdepl"
+-                     darwin_install_name=`otool -L $depdepl | $SED -n -e '3q;2,2p' | $SED -e 's/(.*//'`
++                     darwin_install_name=`$host-otool -L $depdepl | $SED -n -e '3q;2,2p' | $SED -e 's/(.*//'`
+                      darwin_install_name=`$ECHO $darwin_install_name`
+                       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=`$host-otool64 -L $depdepl | $SED -n -e '3q;2,2p' | $SED -e 's/(.*//'`
+                           darwin_install_name=`$ECHO $darwin_install_name`
+                       fi
+                      compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
diff --git a/meta/packages/libtool/libtool-native_2.2.2.bb b/meta/packages/libtool/libtool-native_2.2.2.bb
index 74d4d1bfc7..3a17c180be 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 = "r12"
+PR = "r14"
 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 \
diff --git a/meta/packages/libtool/libtool_2.2.2.bb b/meta/packages/libtool/libtool_2.2.2.bb
index afc3daea48..62e0e3f2f7 100644
--- a/meta/packages/libtool/libtool_2.2.2.bb
+++ b/meta/packages/libtool/libtool_2.2.2.bb
@@ -1,10 +1,10 @@
 require libtool.inc
 
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
            file://fix_static.patch;patch=1 \
-           file://uclibc.patch;patch=1 \
+           file://darwin_fixes.patch;patch=1 \
            file://dolt.m4"
 S = "${WORKDIR}/libtool-${PV}"