diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-23 09:00:36 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-26 17:56:44 +0100 |
| commit | e3c5d7a90ae179af0ac128ea4dfc1a5a6602c2e4 (patch) | |
| tree | b5aa7f46d31fcfd3b3b7a4f3fcdac0a2ec9f0df5 /meta/recipes-devtools/libtool/libtool | |
| parent | 1750e9018f3c22c477c61643efe917eeb074cf65 (diff) | |
| download | ast2050-yocto-poky-e3c5d7a90ae179af0ac128ea4dfc1a5a6602c2e4.zip ast2050-yocto-poky-e3c5d7a90ae179af0ac128ea4dfc1a5a6602c2e4.tar.gz | |
libtool: Fix an issue where unnecessary rpaths were being injected
libtool was being to aggressive in adding rpath to binaries. This
change stops it adding them if that path the default search path.
(From OE-Core rev: 99d1e3ee56c326b3ab68913e68d133a63f334696)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/libtool/libtool')
| -rw-r--r-- | meta/recipes-devtools/libtool/libtool/fix-rpath.patch | 63 |
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..3cdeaec --- /dev/null +++ b/meta/recipes-devtools/libtool/libtool/fix-rpath.patch @@ -0,0 +1,63 @@ +We don't want to add RPATHS which match default linker +search paths, they're a waste of space. This patch +filters libtools list and removes the ones we don't need. + +RP 23/9/2011 + +Upstream-status: Pending + +Index: libtool-2.4/libltdl/config/ltmain.m4sh +=================================================================== +--- libtool-2.4.orig/libltdl/config/ltmain.m4sh 2011-09-23 08:38:06.365043626 +0100 ++++ libtool-2.4/libltdl/config/ltmain.m4sh 2011-09-23 09:57:05.235003068 +0100 +@@ -7264,8 +7264,14 @@ + esac + fi + else +- eval flag=\"$hardcode_libdir_flag_spec\" +- func_append dep_rpath " $flag" ++ # We only want to hardcode in an rpath if it isn't in the ++ # default dlsearch path. ++ case " $sys_lib_dlsearch_path " in ++ *" $libdir "*) ;; ++ *) eval flag=\"$hardcode_libdir_flag_spec\" ++ func_append dep_rpath " $flag" ++ ;; ++ esac + fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in +@@ -8001,8 +8007,14 @@ + esac + fi + else +- eval flag=\"$hardcode_libdir_flag_spec\" +- func_append rpath " $flag" ++ # We only want to hardcode in an rpath if it isn't in the ++ # default dlsearch path. ++ case " $sys_lib_dlsearch_path " in ++ *" $libdir "*) ;; ++ *) eval flag=\"$hardcode_libdir_flag_spec\" ++ rpath+=" $flag" ++ ;; ++ esac + fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in +@@ -8052,8 +8064,14 @@ + esac + fi + else +- eval flag=\"$hardcode_libdir_flag_spec\" +- func_append rpath " $flag" ++ # We only want to hardcode in an rpath if it isn't in the ++ # default dlsearch path. ++ case " $sys_lib_dlsearch_path " in ++ *" $libdir "*) ;; ++ *) eval flag=\"$hardcode_libdir_flag_spec\" ++ func_append rpath " $flag" ++ ;; ++ esac + fi + elif test -n "$runpath_var"; then + case "$finalize_perm_rpath " in |
