From 5f6790bc74beab4ea9cd1de014ada21840cb8c3b Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 23 Feb 2011 10:20:15 +1100 Subject: [PATCH] build: duplicate symbols between system libraries aren't interesting we expect dups in libpthread, libc and libattr Autobuild-User: Andrew Tridgell Autobuild-Date: Wed Feb 23 01:29:38 CET 2011 on sn-devel-104 --- buildtools/wafsamba/symbols.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/buildtools/wafsamba/symbols.py b/buildtools/wafsamba/symbols.py index 4f4b30382b3..0408d61b297 100644 --- a/buildtools/wafsamba/symbols.py +++ b/buildtools/wafsamba/symbols.py @@ -449,11 +449,21 @@ def symbols_dupcheck(task): bld = task.env.bld tgt_list = get_tgt_list(bld) + targets = LOCAL_CACHE(bld, 'TARGET_TYPE') + Logs.info("Checking for duplicate symbols") for sym in bld.env.symbol_map: subsystems = bld.env.symbol_map[sym] if len(subsystems) == 1: 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 + for s in subsystems: + if s != 'c' and (not s in targets or targets[s] != 'SYSLIB'): + all_syslib = False + if all_syslib: + continue Logs.info("symbol %s appears in %s" % (sym, subsystems)) -- 2.34.1