libndr: Avoid assigning duplicate versions to symbols master
authorAmitay Isaacs <amitay@gmail.com>
Tue, 20 Oct 2020 06:27:14 +0000 (17:27 +1100)
committerAmitay Isaacs <amitay@gmail.com>
Tue, 20 Oct 2020 06:27:14 +0000 (17:27 +1100)
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 <amitay@gmail.com>
librpc/wscript_build

index 9da1a3c8192dc7529aaf0968b9b0880e1be06336..398fff7167e8d39357cc08d3c7e5b087ed6a9272 100644 (file)
@@ -645,7 +645,7 @@ bld.SAMBA_LIBRARY('ndr',
     header_path= [('*gen_ndr*', 'gen_ndr')],
     vnum='1.0.1',
     abi_directory='ABI',
     header_path= [('*gen_ndr*', 'gen_ndr')],
     vnum='1.0.1',
     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',
     )
 
 bld.SAMBA_LIBRARY('dcerpc-binding',