[PATCH] some fixes for waf issues

Christian Ambach ambi at samba.org
Wed Jan 29 12:53:16 MST 2014

Hi Andrew,
> oldflags = conf.env['EXTRA_LDFLAGS'];
> conf.env['EXTRA_LDFLAGS'].extend(["-liconv"])
> [...]
> conf.env['EXTRA_LDFLAGS'] = oldflags
> Looking at the logs, EXTRA_LDFLAGS still seems to contain "-liconv" as
> if oldflags was not a copy, but a reference.
> Or am I getting this wrong?

Did some research and my assumption was correct, the code
just created a new reference but not a copy.

So the attached patch should hopefully fix the issues on the HP/UX 
machine in the build farm.

Can you have a look at it please and push it so we can see how the build 
farm reacts?


-------------- next part --------------
From b456360f44d49645222f85486549156506aabe02 Mon Sep 17 00:00:00 2001
From: Christian Ambach <ambi at samba.org>
Date: Wed, 29 Jan 2014 20:48:38 +0100
Subject: [PATCH] waf:lib/replace fix iconv checks on HP/UX

we need to copy away the list of LDFLAGS
to be tried before modifying it instead of
just creating a new reference and then continuing
with a modified list while it should have been
reset back to the original value

Bug: https://bugzilla.samba.org/show_bug.cgi?id=9911

Signed-off-by: Christian Ambach <ambi at samba.org>
 lib/replace/wscript | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/replace/wscript b/lib/replace/wscript
index ab95018..cabf91f 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -398,7 +398,7 @@ removeea setea
             # Some hosts need lib iconv for linking with lib intl
             # So we try with flags just in case it helps.
-            oldflags = conf.env['EXTRA_LDFLAGS'];
+            oldflags = list(conf.env['EXTRA_LDFLAGS']);
             conf.CHECK_FUNCS_IN('dgettext gettext bindtextdomain textdomain bind_textdomain_codeset',
                                 'intl', checklibc=False, headers='libintl.h')

More information about the samba-technical mailing list