[SCM] Samba Shared Repository - branch master updated
Andreas Schneider
asn at samba.org
Tue Jul 19 12:18:01 UTC 2022
The branch, master has been updated
via f340b884724 waf: Check for -Wno-error=array-bounds flags
from 965c6617adc s3:tests: Add test to access msdfs path with smbget
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f340b8847242a7d6ae81e37118c6a6d352fb2d66
Author: Andreas Schneider <asn at samba.org>
Date: Mon Jul 18 10:39:05 2022 +0200
waf: Check for -Wno-error=array-bounds flags
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15073
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Tue Jul 19 12:17:35 UTC 2022 on sn-devel-184
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba_autoconf.py | 3 +++
lib/util/wscript_build | 22 +++++++++++++++++++---
2 files changed, 22 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
index 78927d85193..9db53e40724 100644
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -806,6 +806,9 @@ int main(void) {
conf.env['EXTRA_CFLAGS'] = []
conf.env['EXTRA_CFLAGS'].extend(TO_LIST("-Werror=format"))
+ if CHECK_CFLAGS(conf, ["-Wno-error=array-bounds"]):
+ conf.define('HAVE_WNO_ERROR_ARRAY_BOUNDS', 1)
+
if not Options.options.disable_warnings_as_errors:
conf.ADD_NAMED_CFLAGS('PICKY_CFLAGS', '-Werror -Wno-error=deprecated-declarations', testflags=True)
conf.ADD_NAMED_CFLAGS('PICKY_CFLAGS', '-Wno-error=tautological-compare', testflags=True)
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index e2194e68e3e..df235c13a70 100644
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -165,6 +165,16 @@ else:
local_include=False,
install=False)
+ # TODO: Rewrite ms_fnmatch_core() for a better API.
+ ms_fnmatch_cflags=''
+ if bld.CONFIG_SET('HAVE_WNO_ERROR_ARRAY_BOUNDS'):
+ ms_fnmatch_cflags='-Wno-error=array-bounds'
+ bld.SAMBA_SUBSYSTEM('SAMBA_UTIL_MS_FNMATCH',
+ source='ms_fnmatch.c',
+ deps='talloc',
+ cflags=ms_fnmatch_cflags,
+ local_include=False)
+
bld.SAMBA_LIBRARY('samba-util',
source='''
base64.c
@@ -174,7 +184,6 @@ else:
getpass.c
idtree_random.c
memcache.c
- ms_fnmatch.c
params.c
rbtree.c
rfc1738.c
@@ -194,7 +203,15 @@ else:
util_str_common.c
util_strlist_v3.c
''',
- deps='samba-util-core DYNCONFIG close-low-fd tiniparser genrand util_str_hex',
+ deps='''
+ samba-util-core
+ DYNCONFIG
+ close-low-fd
+ tiniparser
+ genrand
+ util_str_hex
+ SAMBA_UTIL_MS_FNMATCH
+ ''',
public_deps='talloc tevent execinfo pthread LIBCRYPTO charset util_setid',
public_headers='''
attr.h
@@ -212,7 +229,6 @@ else:
tfork.h
''',
header_path= [ ('dlinklist.h samba_util.h', '.'), ('*', 'util') ],
- cflags='-Wno-error=array-bounds',
local_include=False,
vnum='0.0.1',
pc_files='samba-util.pc'
--
Samba Shared Repository
More information about the samba-cvs
mailing list