diff options
| author | Andy Ross <andy.ross@windriver.com> | 2012-08-17 08:53:11 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-22 14:22:51 +0100 |
| commit | e3b0925f4c861393e436deb6b1912f9f1f325d1e (patch) | |
| tree | 40c0ff1ff31807e0158f6e4367fdd045aad09ea6 /meta/recipes-devtools | |
| parent | 3b23feca31480cc56f55301fd0274e622c40b522 (diff) | |
| download | openembedded-core-e3b0925f4c861393e436deb6b1912f9f1f325d1e.tar.gz openembedded-core-e3b0925f4c861393e436deb6b1912f9f1f325d1e.tar.bz2 openembedded-core-e3b0925f4c861393e436deb6b1912f9f1f325d1e.zip | |
libtool: normalize link paths before considering for RPATH
Libtool may be passed link paths of the form "/usr/lib/../lib", which fool
its detection code into thinking it should be included as an RPATH in
the generated binary. Normalize before comparision.
Signed-off-by: Andy Ross <andy.ross@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
| -rw-r--r-- | meta/recipes-devtools/libtool/libtool-2.4.2.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-devtools/libtool/libtool/norm-rpath.patch | 42 |
2 files changed, 43 insertions, 0 deletions
diff --git a/meta/recipes-devtools/libtool/libtool-2.4.2.inc b/meta/recipes-devtools/libtool/libtool-2.4.2.inc index 5b9557ee49..691427e09d 100644 --- a/meta/recipes-devtools/libtool/libtool-2.4.2.inc +++ b/meta/recipes-devtools/libtool/libtool-2.4.2.inc @@ -19,6 +19,7 @@ SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ file://avoid_absolute_paths_for_general_utils.patch \ file://fix-rpath.patch \ file://respect-fstack-protector.patch \ + file://norm-rpath.patch \ " SRC_URI[md5sum] = "d2f3b7d4627e69e13514a40e72a24d50" 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 0000000000..03a7667708 --- /dev/null +++ b/meta/recipes-devtools/libtool/libtool/norm-rpath.patch @@ -0,0 +1,42 @@ +libtool: normalize link paths before considering for RPATH + +Libtool may be passed link paths of the form "/usr/lib/../lib", which +fool its detection code into thinking it should be included as an +RPATH in the generated binary. Normalize before comparision. + +Signed-off-by: Andy Ross <andy.ross@windriver.com> +Upstream-Status: Pending + +diff -ru a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh +--- a/libltdl/config/ltmain.m4sh 2012-08-16 13:58:55.058900363 -0700 ++++ b/libltdl/config/ltmain.m4sh 2012-08-16 16:34:54.616627821 -0700 +@@ -7288,8 +7288,13 @@ + else + # We only want to hardcode in an rpath if it isn't in the + # default dlsearch path. ++ libdir_norm=`echo $libdir \ ++ | sed 's/\/\+\.\(\/\+\|$\)/\//g' \ ++ | sed 's/[^\/]\+\/\+\.\.\(\/\+\|$\)//g' \ ++ | sed 's/\/\+/\//g' \ ++ | sed 's/\(.\)\/$/\1/g'` + case " $sys_lib_dlsearch_path " in +- *" $libdir "*) ;; ++ *" $libdir_norm "*) ;; + *) eval flag=\"$hardcode_libdir_flag_spec\" + func_append dep_rpath " $flag" + ;; +@@ -8027,8 +8032,13 @@ + else + # We only want to hardcode in an rpath if it isn't in the + # default dlsearch path. ++ libdir_norm=`echo $libdir \ ++ | sed 's/\/\+\.\(\/\+\|$\)/\//g' \ ++ | sed 's/[^\/]\+\/\+\.\.\(\/\+\|$\)//g' \ ++ | sed 's/\/\+/\//g' \ ++ | sed 's/\(.\)\/$/\1/g'` + case " $sys_lib_dlsearch_path " in +- *" $libdir "*) ;; ++ *" $libdir_norm "*) ;; + *) eval flag=\"$hardcode_libdir_flag_spec\" + rpath+=" $flag" + ;; |