[PATCH] waf: Fix the build on openbsd

[Stefan (metze) Metzmacher]

Hi Ralph,

Am 09.02.2015 um 12:41 schrieb Ralph Böhme:
> From e10c703a6f8a19fd5119734d157c0911473e6727 Mon Sep 17 00:00:00 2001
> From: Ralph Boehme <slow at samba.org>
> Date: Mon, 9 Feb 2015 12:02:12 +0100
> Subject: [PATCH 1/2] waf: add new file for wafadmin bugfixes
> 
> In order to facilitate differentation between
> 
> 1) pristine upstream waf in wafadmin
> 2) backported upstream commits/bugfixes in wafadmin
> 3) downstream bugfixes
> 
> add a new file samba_wafadmin_fixes.py which is restricted to only
> containing pure wafadmin bugfixes.
> 
> Thereby on future waf upstream imports we can easily review our own
> fixes with a git log buildtools/wafsamba/samba_wafadmin_fixes.py.
> 
> TODO: consolidate previous bugfixes that modify other parts of wafsamba
> in this file.
> 
> Signed-off-by: Ralph Boehme <slow at samba.org>
> ---
>  buildtools/wafsamba/samba_wafadmin_fixes.py | 17 +++++++++++++++++
>  buildtools/wafsamba/wafsamba.py             |  1 +
>  2 files changed, 18 insertions(+)
>  create mode 100644 buildtools/wafsamba/samba_wafadmin_fixes.py
> 
> diff --git a/buildtools/wafsamba/samba_wafadmin_fixes.py b/buildtools/wafsamba/samba_wafadmin_fixes.py
> new file mode 100644
> index 0000000..ef3953f
> --- /dev/null
> +++ b/buildtools/wafsamba/samba_wafadmin_fixes.py
> @@ -0,0 +1,17 @@
> +# This file contains *bugfixes* for wafadmin
> +# In order to facilitate differentation between
> +#
> +# 1) prestine upstream waf in wafadmin
> +# 2) backported upstream commits/bugfixes in wafadmin
> +# 3) downstream bugfixes
> +#
> +# add a new file samba_wafadmin_fixes.py which is restricted to only
> +# containing pure wafadmin bugfixes.
> +#
> +# Therefor on future waf upstream imports we can easily review our own
> +# fixes with a git log buildtools/wafsamba/samba_wafadmin_fixes.py.
> +
> +import os
> +import Build, Utils, Node
> +from TaskGen import feature, after, before
> +import preproc

We should start with an empty file...

> diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
> index c054315..f8d131c 100644
> --- a/buildtools/wafsamba/wafsamba.py
> +++ b/buildtools/wafsamba/wafsamba.py
> @@ -20,6 +20,7 @@ from samba_perl import *
>  from samba_deps import *
>  from samba_bundled import *
>  from samba_third_party import *
> +from samba_wafadmin_fixes import *

This should be the first import (before
from samba_optimisation import *)

samba_get_target_name() checks self.env.DEST_OS more than once.

Thanks!
metze

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: OpenPGP digital signature
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20150209/036e439b/attachment.pgp>