ports/net/samba47/files/patch-source3__wscript_build
Dimitry Andric 3decb07d0f Fix builds of net/samba46 and net/samba47 when using lld 7.0.0.
With lld 7.0.0, the following error is emitted:

  ld: error: duplicate symbol 'pdb_search_init' in version script

This is because the symbol version scripts generated by wscript_build
contain both "pdb_search_init" in the global section, and "pdb_*_init"
in the local section.  Fix it by removing "pdb_*_init" from the local
section.

For net/samba48, this already got fixed, as a side effect of r478825.

Approved by:	portmgr (antoine)
PR:		230602
MFH:		2018Q4
2018-10-07 17:16:23 +00:00

48 lines
1.8 KiB
Text

--- source3/wscript_build.orig 2018-08-11 19:50:02 UTC
+++ source3/wscript_build
@@ -143,7 +143,6 @@ ldapsam_pdb_match = ['!priv2ld', '!smbldap_search_doma
'!get_attr_list']
private_pdb_match.append('!pdb_nds_*')
private_pdb_match.append('!pdb_ldapsam_init*')
-private_pdb_match.append('!pdb_*_init')
private_pdb_match = private_pdb_match + ldapsam_pdb_match
bld.SAMBA3_LIBRARY('samba-passdb',
@@ -240,11 +239,9 @@ bld.SAMBA3_SUBSYSTEM('SMBREGISTRY',
talloc
replace
util_reg
- samba-util
- samba-security
errors3
dbwrap
- samba3-util
+ samba3util
''')
# Do not link against this use 'smbconf'
@@ -510,7 +507,7 @@ bld.SAMBA3_LIBRARY('secrets3',
bld.SAMBA3_LIBRARY('smbldap',
source='lib/smbldap.c',
- deps='ldap lber samba-util smbconf',
+ deps='ldap lber samba3util smbd_shim samba-debug smbconf',
enabled=bld.CONFIG_SET("HAVE_LDAP"),
private_library=False,
abi_directory='lib/ABI',
@@ -734,6 +731,7 @@ bld.SAMBA3_LIBRARY('smbd_base',
smbd_conn
param_service
AVAHI
+ dns_sd
PRINTBASE
PROFILE
LOCKING
@@ -1122,6 +1120,7 @@ bld.SAMBA3_BINARY('client/smbclient',
msrpc3
RPC_NDR_SRVSVC
cli_smb_common
+ dns_sd
archive
''')