diff options
Diffstat (limited to 'meta/recipes-devtools/libtool/libtool/resolve-sysroot.patch')
-rw-r--r-- | meta/recipes-devtools/libtool/libtool/resolve-sysroot.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/meta/recipes-devtools/libtool/libtool/resolve-sysroot.patch b/meta/recipes-devtools/libtool/libtool/resolve-sysroot.patch new file mode 100644 index 0000000000..54f7f5b736 --- /dev/null +++ b/meta/recipes-devtools/libtool/libtool/resolve-sysroot.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | Sometimes .las have =/a/b/c.la in dependency_libs. This should be | ||
2 | resolved to sysroot. | ||
3 | |||
4 | -Khem Raj <raj.khem@gmail.com> | ||
5 | |||
6 | Index: libtool-2.4/libltdl/config/ltmain.m4sh | ||
7 | =================================================================== | ||
8 | --- libtool-2.4.orig/libltdl/config/ltmain.m4sh | ||
9 | +++ libtool-2.4/libltdl/config/ltmain.m4sh | ||
10 | @@ -8479,7 +8479,8 @@ EOF | ||
11 | *.la) | ||
12 | func_basename "$deplib" | ||
13 | name="$func_basename_result" | ||
14 | - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` | ||
15 | + func_resolve_sysroot "$deplib" | ||
16 | + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` | ||
17 | test -z "$libdir" && \ | ||
18 | func_fatal_error "\`$deplib' is not a valid libtool archive" | ||
19 | func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" | ||
20 | @@ -8505,7 +8506,9 @@ EOF | ||
21 | *.la) | ||
22 | func_basename "$lib" | ||
23 | name="$func_basename_result" | ||
24 | - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` | ||
25 | + func_resolve_sysroot "$lib" | ||
26 | + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` | ||
27 | + | ||
28 | test -z "$libdir" && \ | ||
29 | func_fatal_error "\`$lib' is not a valid libtool archive" | ||
30 | func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" | ||
31 | @@ -8524,7 +8527,8 @@ EOF | ||
32 | # the library: | ||
33 | func_basename "$lib" | ||
34 | name="$func_basename_result" | ||
35 | - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` | ||
36 | + func_resolve_sysroot "$lib" | ||
37 | + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` | ||
38 | test -z "$libdir" && \ | ||
39 | func_fatal_error "\`$lib' is not a valid libtool archive" | ||
40 | func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" | ||