Re: Difficulties bringing waf15 updates into Samba (was: Re: [PATCH] build scripts enhancements)

Thomas Nagy tnagy at waf.io
Fri Jun 26 15:30:59 MDT 2015


On Fri, 26 Jun 2015 19:51:56 +1200, Andrew Bartlett wrote:

> On Fri, 2015-06-26 at 07:52 +0200, Thomas Nagy wrote:
> > On Fri, 26 Jun 2015 12:28:05 +1200, Andrew Bartlett wrote:
> > 
> > > On Fri, 2015-06-19 at 18:36 +0200, Thomas Nagy wrote:
> > > > Please apply the patches attached to this message and update your 
> > > > Waf 1.5 copy from the source repository 
> > > > https://github.com/waf-project/waf.waf15
> > > > 
> > > > Thomas
> > > 
> > > If we update waf again, we currently have to keep the local patch 
> > > to
> > > python.py (here the reverse, removing it as part of the update):
> > > 
> > > diff --git a/third_party/waf/wafadmin/Tools/python.py 
> > > b/third_party/waf/wafadmin/Tools/python.py
> > > index cd96b65..b8cfcc2 100644
> > > --- a/third_party/waf/wafadmin/Tools/python.py
> > > +++ b/third_party/waf/wafadmin/Tools/python.py
> > > @@ -195,19 +195,6 @@ LDVERSION = %r
> > >         python_LIBDIR, python_LIBPL, INCLUDEPY, Py_ENABLE_SHARED, 
> > > python_MACOSX_DEPLOYMENT_TARGET,
> > >         python_LDVERSION))
> > >  
> > > -       # Allow some python overrides from env vars for cross
> > > -compiling
> > > -       os_env = dict(os.environ)
> > > -
> > > -       override_python_LDFLAGS = os_env.get('python_LDFLAGS', 
> > > None)
> > > -       if override_python_LDFLAGS is not None:
> > > -               conf.log.write("python_LDFLAGS override from 
> > > environment = %r\n" % (override_python_LDFLAGS))
> > > -               python_LDFLAGS = override_python_LDFLAGS
> > > -
> > > -       override_python_LIBDIR = os_env.get('python_LIBDIR', None)
> > > -       if override_python_LIBDIR is not None:
> > > -               conf.log.write("python_LIBDIR override from 
> > > environment = %r\n" % (override_python_LIBDIR))
> > > -               python_LIBDIR = override_python_LIBDIR
> > > -
> > >         if python_MACOSX_DEPLOYMENT_TARGET:
> > >                 conf.env['MACOSX_DEPLOYMENT_TARGET'] = 
> > > python_MACOSX_DEPLOYMENT_TARGET
> > >                 conf.environ['MACOSX_DEPLOYMENT_TARGET'] = 
> > > python_MACOSX_DEPLOYMENT_TARGET
> > > 
> > > Do you have any thoughts on a better way to do this?
> > > 
> > > We also can't import the whole waf tree, or carry it as a 
> > > submodule, as
> > > that would bring in waf/doc/book which is non-free.  (Carrying that
> > > would cause all distributions, not just Debian, to then have to 
> > > expunge
> > > it from our tarball, and may even cause issues with our obligations 
> > > to
> > > our fiscal sponsor, which strictly requires that Samba distributes 
> > > only
> > > free software).
> > 
> > Are the new git submodules in Samba causing some confusion?
> 
> We are talking about, but not using submodules.  We have started to
> mirror the git repos we would use, so we don't get caught out when
> external hosting services change. 

My bad, I did not understand the submodule situation. Yet, this will not be a problem any longer; the files in attachment will apply directly to the Samba tree. The last new ones represent another important step towards the Waf 1.8 API usage.

> Either way, it would be most helpful if you could assist us with
> liberating the non-free docs.

I realize now that this would not only be useless - there has never been any need to copy the BSD documentation to the Samba tree - but also counter productive. The update script is very coarse and has already lead to poorly reviewed modifications. It is actually much better to have every buildsystem changes follow the same review model as any other for the Samba tree.

This might add some verbosity to the mailing-list, but this is a small sacrifice to pay for build stability after all.

Thomas
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Backported-parts-of-the-waf-1.8-API.patch
Type: text/x-patch
Size: 8021 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20150626/abc27b18/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-Mis-merge-Utils.check_dir-issue.patch
Type: text/x-patch
Size: 797 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20150626/abc27b18/attachment-0001.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0003-Close-file-handles-in-the-build-scripts-too.patch
Type: text/x-patch
Size: 8356 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20150626/abc27b18/attachment-0002.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0004-Use-the-Waf-1.8-API-get_tgen_by_name-instead-of-name.patch
Type: text/x-patch
Size: 17390 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20150626/abc27b18/attachment-0003.bin>


More information about the samba-technical mailing list