sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

lib/replace: move lib/replace/closefrom.c from ROKEN_HOSTCC_SOURCE to REPLACE_HOSTCC_SOURCE

Browse Source 
This is where it really belongs and we avoid the strange interaction
with source4/heimdal_build/config.h. This a follow up for commit
f31333d40e.

This fixes a build problem if libbsd-dev is not installed.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14482

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Björn Jacke <bjacke@samba.org>

Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Tue Sep  8 13:59:58 UTC 2020 on sn-devel-184
This commit is contained in:
Stefan Metzmacher 2020-09-08 10:13:20 +00:00
parent c760ed6190
commit 0022cd9458
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/replace/wscript
View File

@ -874,6 +874,9 @@ def build(bld):
if bld.CONFIG_SET('HAVE_LIBRT'): extra_libs += ' rt'
if bld.CONFIG_SET('REPLACE_REQUIRES_LIBSOCKET_LIBNSL'): extra_libs += ' socket nsl'
if not bld.CONFIG_SET('HAVE_CLOSEFROM'):
REPLACE_HOSTCC_SOURCE += ' closefrom.c'
bld.SAMBA_SUBSYSTEM('LIBREPLACE_HOSTCC',
REPLACE_HOSTCC_SOURCE,
use_hostcc=True,

7
source4/heimdal_build/wscript_build
View File

@ -391,12 +391,7 @@ if not bld.CONFIG_SET('USING_SYSTEM_ROKEN'):
../heimdal_build/replace.c
'''
if not bld.CONFIG_SET('HAVE_CLOSEFROM'):
ROKEN_HOSTCC_SOURCE = ROKEN_COMMON_SOURCE + '''
../../lib/replace/closefrom.c
'''
else:
ROKEN_HOSTCC_SOURCE = ROKEN_COMMON_SOURCE
ROKEN_HOSTCC_SOURCE = ROKEN_COMMON_SOURCE
ROKEN_SOURCE = ROKEN_COMMON_SOURCE + '''
lib/roken/resolve.c