summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/libtool/libtool/norm-rpath.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/libtool/libtool/norm-rpath.patch')
-rw-r--r--meta/recipes-devtools/libtool/libtool/norm-rpath.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-devtools/libtool/libtool/norm-rpath.patch b/meta/recipes-devtools/libtool/libtool/norm-rpath.patch
new file mode 100644
index 0000000..dce1576
--- /dev/null
+++ b/meta/recipes-devtools/libtool/libtool/norm-rpath.patch
@@ -0,0 +1,36 @@
1libtool: normalize link paths before considering for RPATH
2
3Libtool may be passed link paths of the form "/usr/lib/../lib", which
4fool its detection code into thinking it should be included as an
5RPATH in the generated binary. Normalize before comparision.
6
7Signed-off-by: Andy Ross <andy.ross@windriver.com>
8Upstream-Status: Pending
9
10diff -ur a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
11--- a/libltdl/config/ltmain.m4sh 2012-08-16 13:58:55.058900363 -0700
12+++ b/libltdl/config/ltmain.m4sh 2012-08-22 11:01:34.191345989 -0700
13@@ -7288,8 +7288,10 @@
14 else
15 # We only want to hardcode in an rpath if it isn't in the
16 # default dlsearch path.
17+ func_normal_abspath "$libdir"
18+ libdir_norm=$func_normal_abspath_result
19 case " $sys_lib_dlsearch_path " in
20- *" $libdir "*) ;;
21+ *" $libdir_norm "*) ;;
22 *) eval flag=\"$hardcode_libdir_flag_spec\"
23 func_append dep_rpath " $flag"
24 ;;
25@@ -8027,8 +8029,10 @@
26 else
27 # We only want to hardcode in an rpath if it isn't in the
28 # default dlsearch path.
29+ func_normal_abspath "$libdir"
30+ libdir_norm=$func_normal_abspath_result
31 case " $sys_lib_dlsearch_path " in
32- *" $libdir "*) ;;
33+ *" $libdir_norm "*) ;;
34 *) eval flag=\"$hardcode_libdir_flag_spec\"
35 rpath+=" $flag"
36 ;;