[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  0022cd94587 lib/replace: move lib/replace/closefrom.c from ROKEN_HOSTCC_SOURCE to REPLACE_HOSTCC_SOURCE
      from  c760ed61907 gitlab-ci: Fix the sha1sum

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 0022cd94587b805a525b0b9ef71ff0f15780424a
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Sep 8 10:13:20 2020 +0000

    lib/replace: move lib/replace/closefrom.c from ROKEN_HOSTCC_SOURCE to REPLACE_HOSTCC_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
    f31333d40e6fa38daa32a3ebb32d5a317c06fc62.
    
    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 at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Björn Jacke <bjacke at samba.org>
    
    Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(master): Tue Sep  8 13:59:58 UTC 2020 on sn-devel-184

-----------------------------------------------------------------------

Summary of changes:
 lib/replace/wscript                 | 3 +++
 source4/heimdal_build/wscript_build | 7 +------
 2 files changed, 4 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/wscript b/lib/replace/wscript
index 25461153749..85bc11d2f01 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -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,
diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index f7ff33160ca..09c525c2957 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -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


-- 
Samba Shared Repository