summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/libtool/libtool/fix-rpath.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/libtool/libtool/fix-rpath.patch')
-rw-r--r--meta/recipes-devtools/libtool/libtool/fix-rpath.patch63
1 files changed, 63 insertions, 0 deletions
diff --git a/meta/recipes-devtools/libtool/libtool/fix-rpath.patch b/meta/recipes-devtools/libtool/libtool/fix-rpath.patch
new file mode 100644
index 0000000..1571178
--- /dev/null
+++ b/meta/recipes-devtools/libtool/libtool/fix-rpath.patch
@@ -0,0 +1,63 @@
1We don't want to add RPATHS which match default linker
2search paths, they're a waste of space. This patch
3filters libtools list and removes the ones we don't need.
4
5RP 23/9/2011
6
7Upstream-Status: Pending
8
9Index: libtool-2.4.2/libltdl/config/ltmain.m4sh
10===================================================================
11--- libtool-2.4.2.orig/libltdl/config/ltmain.m4sh
12+++ libtool-2.4.2/libltdl/config/ltmain.m4sh
13@@ -7286,8 +7286,14 @@ EOF
14 esac
15 fi
16 else
17- eval flag=\"$hardcode_libdir_flag_spec\"
18- func_append dep_rpath " $flag"
19+ # We only want to hardcode in an rpath if it isn't in the
20+ # default dlsearch path.
21+ case " $sys_lib_dlsearch_path " in
22+ *" $libdir "*) ;;
23+ *) eval flag=\"$hardcode_libdir_flag_spec\"
24+ func_append dep_rpath " $flag"
25+ ;;
26+ esac
27 fi
28 elif test -n "$runpath_var"; then
29 case "$perm_rpath " in
30@@ -8019,8 +8025,14 @@ EOF
31 esac
32 fi
33 else
34- eval flag=\"$hardcode_libdir_flag_spec\"
35- func_append rpath " $flag"
36+ # We only want to hardcode in an rpath if it isn't in the
37+ # default dlsearch path.
38+ case " $sys_lib_dlsearch_path " in
39+ *" $libdir "*) ;;
40+ *) eval flag=\"$hardcode_libdir_flag_spec\"
41+ rpath+=" $flag"
42+ ;;
43+ esac
44 fi
45 elif test -n "$runpath_var"; then
46 case "$perm_rpath " in
47@@ -8070,8 +8082,14 @@ EOF
48 esac
49 fi
50 else
51- eval flag=\"$hardcode_libdir_flag_spec\"
52- func_append rpath " $flag"
53+ # We only want to hardcode in an rpath if it isn't in the
54+ # default dlsearch path.
55+ case " $sys_lib_dlsearch_path " in
56+ *" $libdir "*) ;;
57+ *) eval flag=\"$hardcode_libdir_flag_spec\"
58+ func_append rpath " $flag"
59+ ;;
60+ esac
61 fi
62 elif test -n "$runpath_var"; then
63 case "$finalize_perm_rpath " in