[SCM] Samba Shared Repository - branch master updated

Andreas Schneider asn at samba.org
Mon Oct 7 11:49:03 UTC 2019


The branch, master has been updated
       via  222f2538636 replace: Improve sys/sysctl.h check to catch warning on glibc >= 2.30
      from  7c2745d41e8 libcli/auth: add gnutls test for aes-128-cfb8 cipher bug

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


- Log -----------------------------------------------------------------
commit 222f2538636d247f6ca067e0f8a174799143b155
Author: Andreas Schneider <asn at samba.org>
Date:   Wed Oct 2 14:27:41 2019 +0200

    replace: Improve sys/sysctl.h check to catch warning on glibc >= 2.30
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Mon Oct  7 11:48:24 UTC 2019 on sn-devel-184

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

Summary of changes:
 lib/replace/wscript | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/wscript b/lib/replace/wscript
index c9d27e13df8..e4da1a71a4c 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -106,7 +106,18 @@ def configure(conf):
             conf.SET_TARGET_TYPE('nsl', 'SYSLIB')
     conf.CHECK_HEADERS('rpcsvc/nis.h rpcsvc/ypclnt.h', lib='tirpc nsl')
 
-    conf.CHECK_HEADERS('sys/sysctl.h')
+    # This file is decprecated with glibc >= 2.30 so we need to check if it
+    # includes a deprecation warning:
+    # #warning "The <sys/sysctl.h> header is deprecated and will be removed."
+    conf.CHECK_CODE('''
+                    #include <sys/sysctl.h>
+                    int main(void) { return 0; }
+                    ''',
+                    define='HAVE_SYS_SYSCTL_H',
+                    cflags=['-Werror=cpp'],
+                    addmain=False,
+                    msg='Checking for header sys/sysctl.h')
+
     conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h')
     conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h')
 


-- 
Samba Shared Repository



More information about the samba-cvs mailing list