diff options
Diffstat (limited to 'meta/recipes-devtools/libtool/libtool/fixinstall.patch')
-rw-r--r-- | meta/recipes-devtools/libtool/libtool/fixinstall.patch | 35 |
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] | |||
16 | 16 | ||
17 | RP 2011/11/16 | 17 | RP 2011/11/16 |
18 | 18 | ||
19 | Index: libtool-2.4/libltdl/config/ltmain.m4sh | 19 | Updated by: Robert Yang <liezhi.yang@windriver.com> |
20 | =================================================================== | 20 | |
21 | --- libtool-2.4.orig/libltdl/config/ltmain.m4sh 2011-11-16 14:50:01.070383779 +0000 | 21 | diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in |
22 | +++ libtool-2.4/libltdl/config/ltmain.m4sh 2011-11-16 15:27:13.582310413 +0000 | 22 | --- a/build-aux/ltmain.in |
23 | @@ -2163,7 +2163,7 @@ | 23 | +++ b/build-aux/ltmain.in |
24 | dir="$func_dirname_result" | 24 | @@ -2355,7 +2355,7 @@ func_mode_install () |
25 | dir=$func_dirname_result | ||
25 | func_append dir "$objdir" | 26 | func_append dir "$objdir" |
26 | 27 | ||
27 | - if test -n "$relink_command"; then | 28 | - if test -n "$relink_command"; then |
@@ -29,16 +30,16 @@ Index: libtool-2.4/libltdl/config/ltmain.m4sh | |||
29 | # Strip any trailing slash from the destination. | 30 | # Strip any trailing slash from the destination. |
30 | func_stripname '' '/' "$libdir" | 31 | func_stripname '' '/' "$libdir" |
31 | destlibdir=$func_stripname_result | 32 | destlibdir=$func_stripname_result |
32 | @@ -2202,7 +2202,7 @@ | 33 | @@ -2394,7 +2394,7 @@ func_mode_install () |
33 | shift | 34 | shift |
34 | 35 | ||
35 | srcname="$realname" | 36 | srcname=$realname |
36 | - test -n "$relink_command" && srcname="$realname"T | 37 | - test -n "$relink_command" && srcname=${realname}T |
37 | + test "$fast_install" = no && test -n "$relink_command" && srcname="$realname"T | 38 | + test "$fast_install" = no && test -n "$relink_command" && srcname="$realname"T |
38 | 39 | ||
39 | # Install the shared library and build the symlinks. | 40 | # Install the shared library and build the symlinks. |
40 | func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ | 41 | func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ |
41 | @@ -5856,15 +5856,15 @@ | 42 | @@ -6162,15 +6162,15 @@ func_mode_link () |
42 | # Hardcode the library path. | 43 | # Hardcode the library path. |
43 | # Skip directories that are in the system default run-time | 44 | # Skip directories that are in the system default run-time |
44 | # search path. | 45 | # search path. |
@@ -63,7 +64,7 @@ Index: libtool-2.4/libltdl/config/ltmain.m4sh | |||
63 | case " $sys_lib_dlsearch_path " in | 64 | case " $sys_lib_dlsearch_path " in |
64 | *" $libdir "*) ;; | 65 | *" $libdir "*) ;; |
65 | *) | 66 | *) |
66 | @@ -5930,15 +5930,15 @@ | 67 | @@ -6236,15 +6236,15 @@ func_mode_link () |
67 | # Hardcode the library path. | 68 | # Hardcode the library path. |
68 | # Skip directories that are in the system default run-time | 69 | # Skip directories that are in the system default run-time |
69 | # search path. | 70 | # search path. |
@@ -88,14 +89,14 @@ Index: libtool-2.4/libltdl/config/ltmain.m4sh | |||
88 | case " $sys_lib_dlsearch_path " in | 89 | case " $sys_lib_dlsearch_path " in |
89 | *" $libdir "*) ;; | 90 | *" $libdir "*) ;; |
90 | *) | 91 | *) |
91 | @@ -6284,8 +6284,8 @@ | 92 | @@ -6590,8 +6590,8 @@ func_mode_link () |
92 | eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` | 93 | eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` |
93 | test -z "$libdir" && \ | 94 | test -z "$libdir" && \ |
94 | func_fatal_error "\`$deplib' is not a valid libtool archive" | 95 | func_fatal_error "'$deplib' is not a valid libtool archive" |
95 | - test "$absdir" != "$libdir" && \ | 96 | - test "$absdir" != "$libdir" && \ |
96 | - func_warning "\`$deplib' seems to be moved" | 97 | - func_warning "'$deplib' seems to be moved" |
97 | + #test "$absdir" != "$libdir" && \ | 98 | + #test "$absdir" != "$libdir" && \ |
98 | + # func_warning "\`$deplib' seems to be moved" | 99 | + # func_warning "'$deplib' seems to be moved" |
99 | 100 | ||
100 | path="-L$absdir" | 101 | path=-L$absdir |
101 | fi | 102 | fi |