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

[Andrew Bartlett]

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. 

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

Thanks,

Andrew Bartlett
-- 
Andrew Bartlett
https://samba.org/~abartlet/
Authentication Developer, Samba Team         https://samba.org
Samba Development and Support, Catalyst IT   
https://catalyst.net.nz/services/samba