From 0a6e0edc047e6ec4b4fe9483f9961fff6b7061f9 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 23 Feb 2011 17:05:47 +1100 Subject: build: don't display expected duplicate symbols --- buildtools/wafsamba/symbols.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/buildtools/wafsamba/symbols.py b/buildtools/wafsamba/symbols.py index 0408d61b29..0d0af79d06 100644 --- a/buildtools/wafsamba/symbols.py +++ b/buildtools/wafsamba/symbols.py @@ -453,9 +453,14 @@ def symbols_dupcheck(task): Logs.info("Checking for duplicate symbols") for sym in bld.env.symbol_map: - subsystems = bld.env.symbol_map[sym] + subsystems = set(bld.env.symbol_map[sym]) if len(subsystems) == 1: continue + + if sym in ['main', '_init', '_fini', 'init_samba_module', 'samba_init_module', 'ldb_init_module' ]: + # these are expected to be in many subsystems + continue + # if all of them are in system libraries, we can ignore them. This copes # with the duplication between libc, libpthread and libattr all_syslib = True -- cgit