1 files changed, 18 insertions, 17 deletions

diff --git a/meta/recipes-devtools/libtool/libtool/fixinstall.patch b/meta/recipes-devtools/libtool/libtool/fixinstall.patch
index 279c07be37..8f343bf436 100644
--- a/meta/recipes-devtools/libtool/libtool/fixinstall.patch
+++ b/meta/recipes-devtools/libtool/libtool/fixinstall.patch
@@ -16,12 +16,13 @@ Upstream-Status: Inappropriate [upstream are unlikely to take a patch like this]
 
 RP 2011/11/16
 
-Index: libtool-2.4/libltdl/config/ltmain.m4sh
-===================================================================
---- libtool-2.4.orig/libltdl/config/ltmain.m4sh 2011-11-16 14:50:01.070383779 +0000
-+++ libtool-2.4/libltdl/config/ltmain.m4sh      2011-11-16 15:27:13.582310413 +0000
-@@ -2163,7 +2163,7 @@
-        dir="$func_dirname_result"
+Updated by: Robert Yang <liezhi.yang@windriver.com>
+
+diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
+--- a/build-aux/ltmain.in
++++ b/build-aux/ltmain.in
+@@ -2355,7 +2355,7 @@ func_mode_install ()
+        dir=$func_dirname_result
         func_append dir "$objdir"
  
 -       if test -n "$relink_command"; then
@@ -29,16 +30,16 @@ Index: libtool-2.4/libltdl/config/ltmain.m4sh
        # Strip any trailing slash from the destination.
        func_stripname '' '/' "$libdir"
        destlibdir=$func_stripname_result
-@@ -2202,7 +2202,7 @@
+@@ -2394,7 +2394,7 @@ func_mode_install ()
           shift
  
-          srcname="$realname"
--         test -n "$relink_command" && srcname="$realname"T
+          srcname=$realname
+-         test -n "$relink_command" && srcname=${realname}T
 +         test "$fast_install" = no && test -n "$relink_command" && srcname="$realname"T
  
           # Install the shared library and build the symlinks.
           func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
-@@ -5856,15 +5856,15 @@
+@@ -6162,15 +6162,15 @@ func_mode_link ()
             # Hardcode the library path.
             # Skip directories that are in the system default run-time
             # search path.
@@ -63,7 +64,7 @@ Index: libtool-2.4/libltdl/config/ltmain.m4sh
             case " $sys_lib_dlsearch_path " in
             *" $libdir "*) ;;
             *)
-@@ -5930,15 +5930,15 @@
+@@ -6236,15 +6236,15 @@ func_mode_link ()
             # Hardcode the library path.
             # Skip directories that are in the system default run-time
             # search path.
@@ -88,14 +89,14 @@ Index: libtool-2.4/libltdl/config/ltmain.m4sh
             case " $sys_lib_dlsearch_path " in
             *" $libdir "*) ;;
             *)
-@@ -6284,8 +6284,8 @@
-                  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+@@ -6590,8 +6590,8 @@ func_mode_link ()
+                  eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
                   test -z "$libdir" && \
-                    func_fatal_error "\`$deplib' is not a valid libtool archive"
+                    func_fatal_error "'$deplib' is not a valid libtool archive"
 -                 test "$absdir" != "$libdir" && \
--                   func_warning "\`$deplib' seems to be moved"
+-                   func_warning "'$deplib' seems to be moved"
 +                 #test "$absdir" != "$libdir" && \
-+                 #  func_warning "\`$deplib' seems to be moved"
++                 #  func_warning "'$deplib' seems to be moved"
  
-                  path="-L$absdir"
+                  path=-L$absdir
                 fi