summaryrefslogtreecommitdiffstats
path: root/python
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2014-12-18 18:09:15 +0100
committerJeremy Allison <jra@samba.org>2015-01-08 23:38:07 +0100
commitdc808a466ef835535a3d4bb87f19316eeff1c567 (patch)
tree01ce0aeb19c212e7c38928d04f6ace0ff733cbbe /python
parentd744c7c080d81121b84a592a95761e03c2a1090c (diff)
downloadsamba-dc808a466ef835535a3d4bb87f19316eeff1c567.tar.gz
samba-dc808a466ef835535a3d4bb87f19316eeff1c567.tar.xz
samba-dc808a466ef835535a3d4bb87f19316eeff1c567.zip
wafsamba: fix ordering problems with lib-provided and internal RPATHs
When a library or system (like cups) provides an RPATH, e.g. with -Wl,-R or -Wl,-rpath, this was added by waf to the LINKFLAGS, wich was later prepended to our RPATH. But if the path by chance contains an older version of one of our internal libraries like talloc, this would lead to linking the too old talloc into our binaries. This has been observed on, e.g., FreeBSD, but it is a general problem. This patch fixes the problem by specially parsing the RPATH linker options from the pkg-config(, cups-config, ....) output and putting the paths into the RPATH_<lib> container, which is then later correctly appended to our internal RPATH. This is a better fix than commit 64f5e24100a764ec198cab9a8d2c43fa86e7027c as it touches wafsamba only. 64f5e24100a764ec198cab9a8d2c43fa86e7027c is already in waf 1.5 upstream, but has some possible bugs, e.g. it doesn't handle -Wl,-R, (with ',' at the end) or some combinations where the path is given via an additional -Wl,/path argument. Bug: https://bugzilla.samba.org/show_bug.cgi?id=10548 Pair-Programmed-With: Stefan Metzmacher <metze@samba.org> Signed-off-by: Michael Adam <obnox@samba.org> Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'python')
0 files changed, 0 insertions, 0 deletions