build(waf): fix the abi_match for the pdb library
authorMichael Adam <obnox@samba.org>
Tue, 15 Jan 2013 14:35:09 +0000 (15:35 +0100)
committerKarolin Seeger <kseeger@samba.org>
Mon, 28 Jan 2013 10:07:35 +0000 (11:07 +0100)
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
(cherry picked from commit 9ba44cc610426fb558b49aa9680b5bdf55c29082)

source3/wscript_build

index 2de436327bfca0fc9163d80f23e507a313ebfb10..02040bf2c24449ff12ed2618a27d7bb4ef5fdcd0 100755 (executable)
@@ -730,7 +730,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())