From: Michael Adam <obnox@samba.org>
Date: Tue, 15 Jan 2013 14:35:09 +0000 (+0100)
Subject: build(waf): fix the abi_match for the pdb library
X-Git-Tag: ldb-1.1.15~131
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9ba44cc610426fb558b49aa9680b5bdf55c29082;p=thirdparty%2Fsamba.git

build(waf): fix the abi_match for the pdb library

The global wildcard match is automatically added by the parsing code
if the global match list is empty. Specifying an explicit '*' as the only
global match lets the parsing code add a second '*' to the local list,
which is an error tolerated on my linux by ld (the GNU linker), but
not by the stricter GNU ELF linker "gold".

Pair-Programmed-With: Gregor Beck <gbeck@sernet.de>

Signed-off-by: Gregor Beck <gbeck@sernet.de>
Signed-off-by: Michael Adam <obnox@samba.org>
Signed-off-by: Alexander Bokovoy <ab@samba.org>

Autobuild-User(master): Alexander Bokovoy <ab@samba.org>
Autobuild-Date(master): Wed Jan 16 21:31:00 CET 2013 on sn-devel-104
---

diff --git a/source3/wscript_build b/source3/wscript_build
index 107587d0bc5..2e530f56f46 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -731,7 +731,7 @@ bld.SAMBA3_LIBRARY('pdb',
 				include/passdb.h
 				passdb/machine_sid.h
 				passdb/lookup_sid.h''',
-                   abi_match=private_pdb_match + ['*'],
+                   abi_match=private_pdb_match,
                    abi_directory='passdb/ABI',
                    vnum='0',
                    vars=locals())