[PATCH] waf: Fix the build on openbsd

[Volker Lendecke]

On Tue, Feb 03, 2015 at 02:44:20PM +0100, Ralph Böhme wrote:
> On Tue, Feb 03, 2015 at 01:59:22PM +0100, Volker Lendecke wrote:
> > On Tue, Feb 03, 2015 at 01:46:39PM +0100, Ralph Böhme wrote:
> > > patch attached. Of course completely untested. :)
> > 
> > To me this looks as if we duplicate code that is just buggy in
> > wafadmin.
> 
> But that "duplicate code" contains the fix.

Right, but is it something close to binary code patching the
right strategy? We will have to revisit each and every of
those patches when someone imports a new waf. I think it's
easier to find all changes to wafadmin if they actually
happen in wafadmin/. You can do a 

cd buildtools/wafadmin; git log .

if you keep the changes in wafadmin. If we sprinkle patches
to wafadmin to wafsamba, they are completely separate and
much harder to find.

> > We should contact waf upstream to fix it, right?
> 
> Been there, done that, not going there again.

Then others that have better contacts with Thomas Nagy should
contact him.

> > BTW, this bug was introduced with a commit message that said
> > 
> > "wafadmin: backported the openbsd fixes from waf 1.7"
> > 
> > What about just reverting this broken backport of a fix that isn't?
> 
> Are you sure it's broken? To me it looks like it's just single bug in

A few months I could build on openbsd. This piece has
changed with 115eb94215f4 and now causes problems. I'm not
entirely certain what to think about that situation if the
115eb94215f4 patch is not breaking something.

> one place that you've come across. But as the backport is from Michael
> and metze, maybe either one of em can shed some light on this.
> 
> If the bug is in an *existing* patch to wafadmin, imho we may as well
> simply apply your original patch, possibly with an ammended commit
> message with a reference to the broken commit, shall we ?

You're the waf guru here, I have no clue about python as the
Alexander's comments happily showed.

Volker

-- 
SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen
phone: +49-551-370000-0, fax: +49-551-370000-9
AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen
http://www.sernet.de, mailto:kontakt at sernet.de