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