[PATCH] fix various build problems

Jelmer Vernooij jelmer at samba.org
Tue Oct 28 13:56:51 MDT 2014


On Tue, Oct 28, 2014 at 12:45:00PM -0700, Jeremy Allison wrote:
> On Tue, Oct 28, 2014 at 08:35:05PM +0100, Jelmer Vernooij wrote:
> > On Tue, Oct 28, 2014 at 06:28:19PM +0100, Michael Adam wrote:
> > > Attached is a patch to fix this problem.
> > > It does so by filtering out the standard directories.
> > > It uses ${CC} -print-search-dirs to build
> > > the list of standard lib dirs. At least gcc and clang
> > > support this.
> > Thanks for working on this!
> > 
> > > The patch may need some more changes, because it
> > > currently touches wafadmin to filter the standard paths.
> > We should really avoid changing wafadmin. Any changes would be lost when
> > we next pull in a new version of waf.
> 
> If we can, we should. But if we've sent a
> patch upstream I don't think it's an unforgivable
> sin to change our downstream version whilst
> waiting for an upstream patched version.

That would mean forcing people to use third_party/ for any library
in which we have made changes that have not been upstreamed yet. That
goes against the philosophy of third_party, which is there just for those
on platforms without package managers or outdated packages.

This is a patch for which we *can* avoid patching wafadmin. Patching
wafsamba rather than wafadmin might be slightly more work in the short term,
but makes our life easier in the future when we don't have to do complex
merges when we update our copy of waf.

Patching our bundled copies of libraries also makes life a lot harder for
packagers, since they would have to patch the system version of these
libraries.

Jelmer


More information about the samba-technical mailing list