diff options
Diffstat (limited to 'recipes/libtool/libtool-2.4/resolve-sysroot.patch')
| -rw-r--r-- | recipes/libtool/libtool-2.4/resolve-sysroot.patch | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/recipes/libtool/libtool-2.4/resolve-sysroot.patch b/recipes/libtool/libtool-2.4/resolve-sysroot.patch index 57689a5887..62ad72bed3 100644 --- a/recipes/libtool/libtool-2.4/resolve-sysroot.patch +++ b/recipes/libtool/libtool-2.4/resolve-sysroot.patch @@ -6,7 +6,7 @@ Index: libtool-2.4/libltdl/config/ltmain.m4sh =================================================================== --- libtool-2.4.orig/libltdl/config/ltmain.m4sh +++ libtool-2.4/libltdl/config/ltmain.m4sh -@@ -8480,7 +8480,8 @@ EOF +@@ -8479,7 +8479,8 @@ EOF *.la) func_basename "$deplib" name="$func_basename_result" @@ -16,3 +16,24 @@ Index: libtool-2.4/libltdl/config/ltmain.m4sh test -z "$libdir" && \ func_fatal_error "\`$deplib' is not a valid libtool archive" func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" +@@ -8505,7 +8506,9 @@ EOF + *.la) + func_basename "$lib" + name="$func_basename_result" +- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` ++ func_resolve_sysroot "$lib" ++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` ++ + test -z "$libdir" && \ + func_fatal_error "\`$lib' is not a valid libtool archive" + func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" +@@ -8524,7 +8527,8 @@ EOF + # the library: + func_basename "$lib" + name="$func_basename_result" +- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` ++ func_resolve_sysroot "$lib" ++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` + test -z "$libdir" && \ + func_fatal_error "\`$lib' is not a valid libtool archive" + func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" |