From: Andy Ross <andy.ross@windriver.com>
To: openembedded-core@openembedded.org
Subject: [PATCH 2/2] libtool: normalize link paths before considering for RPATH
Date: Fri, 17 Aug 2012 08:53:11 -0700 [thread overview]
Message-ID: <1345218791-28891-3-git-send-email-andy.ross@windriver.com> (raw)
In-Reply-To: <1345218791-28891-2-git-send-email-andy.ross@windriver.com>
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>
---
meta/recipes-devtools/libtool/libtool-2.4.2.inc | 1 +
.../libtool/libtool/norm-rpath.patch | 42 ++++++++++++++++++++++
2 files changed, 43 insertions(+)
create mode 100644 meta/recipes-devtools/libtool/libtool/norm-rpath.patch
diff --git a/meta/recipes-devtools/libtool/libtool-2.4.2.inc b/meta/recipes-devtools/libtool/libtool-2.4.2.inc
index 5b9557e..691427e 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 0000000..03a7667
--- /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"
+ ;;
--
1.7.11.2
next prev parent reply other threads:[~2012-08-17 16:05 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-17 15:53 [PATCH 0/2] RPATH host pollution fixes Andy Ross
2012-08-17 15:53 ` [PATCH 1/2] insane.bbclass: Fix RPATH warning in the face of funny path strings Andy Ross
2012-08-17 15:53 ` Andy Ross [this message]
2012-08-19 10:06 ` [PATCH 2/2] libtool: normalize link paths before considering for RPATH Richard Purdie
2012-08-20 16:59 ` Andy Ross
2012-08-20 21:55 ` Richard Purdie
2012-08-17 16:20 ` [PATCH 1/2] insane.bbclass: Fix RPATH warning in the face of funny path strings Richard Purdie
2012-08-20 21:05 ` [PATCH] " Andy Ross
2012-08-21 15:49 ` Saul Wold
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1345218791-28891-3-git-send-email-andy.ross@windriver.com \
--to=andy.ross@windriver.com \
--cc=openembedded-core@lists.openembedded.org \
--cc=openembedded-core@openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.