1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
samba-mirror/buildtools
Michael Adam dc808a466e 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 64f5e24100
as it touches wafsamba only. 64f5e24100
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>
2015-01-08 23:38:07 +01:00
..
bin Include waf as an extracted source directory, rather than as a one-in-a-file script. 2012-01-04 22:34:20 +01:00
scripts gen_abi.sh: filter out symbols not needed for ABI 2012-09-07 12:31:42 +02:00
wafadmin Revert "buildtools: Rename perl vendorarch configure option." 2014-09-09 03:07:20 +02:00
wafsamba wafsamba: fix ordering problems with lib-provided and internal RPATHs 2015-01-08 23:38:07 +01:00
compare_config_h4.sh waf/buildtools: use /bin/sh instead of /bin/bash and put ^ in quotes 2010-12-02 10:36:06 +01:00
compare_generated.sh waf/buildtools: use /bin/sh instead of /bin/bash and put ^ in quotes 2010-12-02 10:36:06 +01:00
compare_install.sh waf/buildtools: use /bin/sh instead of /bin/bash and put ^ in quotes 2010-12-02 10:36:06 +01:00
README Include waf as an extracted source directory, rather than as a one-in-a-file script. 2012-01-04 22:34:20 +01:00
testwaf.sh ldb: make ldb a top level library for Samba 4.0 2011-07-05 17:24:47 +10:00
update-waf.sh update-waf.sh: make mktemp happy by including anything Xes. 2012-06-15 01:18:08 +02:00

See http://code.google.com/p/waf/ for more information on waf

You can get a svn copy of the upstream source with:

  svn checkout http://waf.googlecode.com/svn/trunk/ waf-read-only

Samba currently uses waf 1.5, which can be found at:

  http://waf.googlecode.com/svn/branches/waf-1.5

To update the current copy of waf, use the update-waf.sh script in this
directory.