diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2019-03-08 04:35:39 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2019-03-12 00:42:19 +0000 |
| commit | d959bea2a8f2c6ec773c9bbf09037aa7bf85d494 (patch) | |
| tree | 9bd6e96aa4a64f9531781ffb74dcd9d0ffdbbdd2 /source3/modules | |
| parent | afd5d34f5e1d13ba88448b3b94d353aa8361d1a9 (diff) | |
| download | samba-d959bea2a8f2c6ec773c9bbf09037aa7bf85d494.tar.gz | |
modules: Add dependency on tirpc to vfs_nfs4acl_xattr
This is done as a new subsystem (either filled or empty) rather than via string
manipulation.
This will fix compile error on fedora.
Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Diffstat (limited to 'source3/modules')
| -rw-r--r-- | source3/modules/wscript_build | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/source3/modules/wscript_build b/source3/modules/wscript_build index 30347e0fc6d..e67a0abe10c 100644 --- a/source3/modules/wscript_build +++ b/source3/modules/wscript_build @@ -247,11 +247,6 @@ bld.SAMBA_GENERATOR('nfs41acl-h', target='nfs41acl.h', rule='rpcgen -h ${SRC} > ${TGT}') -vfs_nfs4acl_xattr_source = ''' - vfs_nfs4acl_xattr.c - nfs4acl_xattr_ndr.c - nfs4acl_xattr_xdr.c - ''' if bld.CONFIG_SET("HAVE_RPC_XDR_H"): xdr_buf_hack = 'sed -e "s@^\([ \t]*register int32_t \*buf\);@\\1 = buf;@"' @@ -271,12 +266,20 @@ if bld.CONFIG_SET("HAVE_RPC_XDR_H"): '${TGT[0].path_from(tsk.get_cwd())[:-len(tsk.outputs[0].name)] + tsk.inputs[0].name} | ' + \ xdr_buf_hack + ' > ${TGT}') - vfs_nfs4acl_xattr_source += ' nfs41acl_xdr.c' + bld.SAMBA_SUBSYSTEM('VFS_NFS4_XDR', + source='nfs41acl_xdr.c', + deps='NFS4_ACLS NDR_NFS4ACL tirpc') +else: + bld.SET_TARGET_TYPE('VFS_NFS4_XDR', 'EMPTY') bld.SAMBA3_MODULE('vfs_nfs4acl_xattr', subsystem='vfs', - source=vfs_nfs4acl_xattr_source, - deps='NFS4_ACLS sunacl NDR_NFS4ACL', + source = ''' + vfs_nfs4acl_xattr.c + nfs4acl_xattr_ndr.c + nfs4acl_xattr_xdr.c + ''', + deps='NFS4_ACLS sunacl NDR_NFS4ACL VFS_NFS4_XDR', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_nfs4acl_xattr'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_nfs4acl_xattr')) |