From fcf5db4d3091ec231edb2e9dc86ed92795ead34d Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Tue, 20 Oct 2020 17:27:14 +1100 Subject: [PATCH] libndr: Avoid assigning duplicate versions to symbols BUG: https://bugzilla.samba.org/show_bug.cgi?id=14541 Symbols _ndr_push_error and _ndr_pull_error keep getting redefined as they are included without wildcard in abi_match. Apparently on linux ld does not complain about duplicate symbols, but on freebsd ld fails to link with following error: [ 918/3912] Linking bin/default/librpc/libndr.so ld: error: duplicate symbol '_ndr_pull_error' in version script ld: error: duplicate symbol '_ndr_push_error' in version script clang: error: linker command failed with exit code 1 (use -v to see invocation) Signed-off-by: Amitay Isaacs Reviewed-by: Andreas Schneider (cherry picked from commit 4cd195aafefb02b6921ea8439dd3897f8c74b012) --- librpc/wscript_build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/librpc/wscript_build b/librpc/wscript_build index 398b299f339..27b180fa63d 100644 --- a/librpc/wscript_build +++ b/librpc/wscript_build @@ -645,7 +645,7 @@ bld.SAMBA_LIBRARY('ndr', header_path= [('*gen_ndr*', 'gen_ndr')], vnum='1.0.0', abi_directory='ABI', - abi_match='!ndr_table_* ndr_* GUID_* _ndr_pull_error _ndr_push_error', + abi_match='!ndr_table_* ndr_* GUID_* _ndr_pull_error* _ndr_push_error*', ) bld.SAMBA_LIBRARY('dcerpc-binding', -- 2.26.2