diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2010-11-08 11:10:56 -0800 |
---|---|---|
committer | Saul Wold <Saul.Wold@intel.com> | 2010-11-18 13:30:25 -0800 |
commit | 563953df47785bf57969d86b9b5f8494e585a28c (patch) | |
tree | 4b9d4cdb858f08894503dcd5233e6bcf5ed7ab6e /meta/recipes-devtools/libtool/libtool/cross_compile.patch | |
parent | aa5befab23679e07441805e18d9b6f3f271b5ed5 (diff) | |
download | poky-563953df47785bf57969d86b9b5f8494e585a28c.tar.gz |
libtool upgrade from 2.2.10 to 2.4
Taking out of this code from patch as the newer upstream code has fix,
and this patch is not needed.
cross-compile.patch:
-Index: libtool-2.2.10/libltdl/config/ltmain.m4sh
+Index: libtool-2.4/libltdl/config/ltmain.m4sh
===================================================================
---- libtool-2.2.10.orig/libltdl/config/ltmain.m4sh
-+++ libtool-2.2.10/libltdl/config/ltmain.m4sh
-@@ -5147,8 +5147,14 @@ func_mode_link ()
- absdir="$abs_ladir"
- libdir="$abs_ladir"
- else
-- dir="$libdir"
-- absdir="$libdir"
-+ # Adding 'libdir' from the .la file to our library search
paths
-+ # breaks crosscompilation horribly. We cheat here and don't
add
-+ # it, instead adding the path where we found the .la. -CL
-+ dir="$abs_ladir"
-+ absdir="$abs_ladir"
-+ libdir="$abs_ladir"
-+ #dir="$libdir"
-+ #absdir="$libdir"
- fi
- test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
- else
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Diffstat (limited to 'meta/recipes-devtools/libtool/libtool/cross_compile.patch')
-rw-r--r-- | meta/recipes-devtools/libtool/libtool/cross_compile.patch | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/meta/recipes-devtools/libtool/libtool/cross_compile.patch b/meta/recipes-devtools/libtool/libtool/cross_compile.patch index fc1f4b6fb2..28539ff039 100644 --- a/meta/recipes-devtools/libtool/libtool/cross_compile.patch +++ b/meta/recipes-devtools/libtool/libtool/cross_compile.patch | |||
@@ -4,28 +4,11 @@ Not upstreable in this form. | |||
4 | 4 | ||
5 | RP - 01/05/2008 | 5 | RP - 01/05/2008 |
6 | 6 | ||
7 | Index: libtool-2.2.10/libltdl/config/ltmain.m4sh | 7 | Index: libtool-2.4/libltdl/config/ltmain.m4sh |
8 | =================================================================== | 8 | =================================================================== |
9 | --- libtool-2.2.10.orig/libltdl/config/ltmain.m4sh | 9 | --- libtool-2.4.orig/libltdl/config/ltmain.m4sh |
10 | +++ libtool-2.2.10/libltdl/config/ltmain.m4sh | 10 | +++ libtool-2.4/libltdl/config/ltmain.m4sh |
11 | @@ -5147,8 +5147,14 @@ func_mode_link () | 11 | @@ -6121,8 +6121,6 @@ func_mode_link () |
12 | absdir="$abs_ladir" | ||
13 | libdir="$abs_ladir" | ||
14 | else | ||
15 | - dir="$libdir" | ||
16 | - absdir="$libdir" | ||
17 | + # Adding 'libdir' from the .la file to our library search paths | ||
18 | + # breaks crosscompilation horribly. We cheat here and don't add | ||
19 | + # it, instead adding the path where we found the .la. -CL | ||
20 | + dir="$abs_ladir" | ||
21 | + absdir="$abs_ladir" | ||
22 | + libdir="$abs_ladir" | ||
23 | + #dir="$libdir" | ||
24 | + #absdir="$libdir" | ||
25 | fi | ||
26 | test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes | ||
27 | else | ||
28 | @@ -5519,8 +5525,6 @@ func_mode_link () | ||
29 | add="$libdir/$linklib" | 12 | add="$libdir/$linklib" |
30 | fi | 13 | fi |
31 | else | 14 | else |
@@ -34,7 +17,7 @@ Index: libtool-2.2.10/libltdl/config/ltmain.m4sh | |||
34 | # Try looking first in the location we're being installed to. | 17 | # Try looking first in the location we're being installed to. |
35 | if test -n "$inst_prefix_dir"; then | 18 | if test -n "$inst_prefix_dir"; then |
36 | case $libdir in | 19 | case $libdir in |
37 | @@ -5667,7 +5671,17 @@ func_mode_link () | 20 | @@ -6277,7 +6275,17 @@ func_mode_link () |
38 | fi | 21 | fi |
39 | ;; | 22 | ;; |
40 | *) | 23 | *) |