diff options
author | Rob van der Linde <rob@catalyst.net.nz> | 2023-02-23 15:52:21 +1300 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2023-02-23 22:32:33 +0000 |
commit | 92732858860072f98d358bb89ace00856b469bfa (patch) | |
tree | 5f2a90838c75977b74733f8edd9d5680e0a6ed79 | |
parent | 4717a58f6ceb40f2fb3d990191f86d18283146b8 (diff) | |
download | samba-92732858860072f98d358bb89ace00856b469bfa.tar.gz |
buildtools: fix mutable default arguments
Signed-off-by: Rob van der Linde <rob@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Joseph Sutton <josephsutton@catalyst.net.nz>
-rw-r--r-- | buildtools/wafsamba/samba_autoconf.py | 8 | ||||
-rw-r--r-- | buildtools/wafsamba/samba_bundled.py | 8 | ||||
-rw-r--r-- | buildtools/wafsamba/wafsamba.py | 4 |
3 files changed, 15 insertions, 5 deletions
diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py index b047fe421b4..f429ad2d487 100644 --- a/buildtools/wafsamba/samba_autoconf.py +++ b/buildtools/wafsamba/samba_autoconf.py @@ -892,10 +892,12 @@ def CONFIG_PATH(conf, name, default): conf.env[name] = conf.env['PREFIX'] + default @conf -def ADD_NAMED_CFLAGS(conf, name, flags, testflags=False, prereq_flags=[]): +def ADD_NAMED_CFLAGS(conf, name, flags, testflags=False, prereq_flags=None): '''add some CFLAGS to the command line optionally set testflags to ensure all the flags work ''' + if prereq_flags is None: + prereq_flags = [] prereq_flags = TO_LIST(prereq_flags) if testflags: ok_flags=[] @@ -908,10 +910,12 @@ def ADD_NAMED_CFLAGS(conf, name, flags, testflags=False, prereq_flags=[]): conf.env[name].extend(TO_LIST(flags)) @conf -def ADD_CFLAGS(conf, flags, testflags=False, prereq_flags=[]): +def ADD_CFLAGS(conf, flags, testflags=False, prereq_flags=None): '''add some CFLAGS to the command line optionally set testflags to ensure all the flags work ''' + if prereq_flags is None: + prereq_flags = [] ADD_NAMED_CFLAGS(conf, 'EXTRA_CFLAGS', flags, testflags=testflags, prereq_flags=prereq_flags) diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py index 7d2d855cd9c..c7b7246e0d6 100644 --- a/buildtools/wafsamba/samba_bundled.py +++ b/buildtools/wafsamba/samba_bundled.py @@ -104,12 +104,14 @@ def LIB_MUST_BE_PRIVATE(conf, libname): @conf def CHECK_BUNDLED_SYSTEM_PKG(conf, libname, minversion='0.0.0', - maxversion=None, version_blacklist=[], + maxversion=None, version_blacklist=None, onlyif=None, implied_deps=None, pkg=None): '''check if a library is available as a system library. This only tries using pkg-config ''' + if version_blacklist is None: + version_blacklist = [] return conf.CHECK_BUNDLED_SYSTEM(libname, minversion=minversion, maxversion=maxversion, @@ -120,7 +122,7 @@ def CHECK_BUNDLED_SYSTEM_PKG(conf, libname, minversion='0.0.0', @conf def CHECK_BUNDLED_SYSTEM(conf, libname, minversion='0.0.0', - maxversion=None, version_blacklist=[], + maxversion=None, version_blacklist=None, checkfunctions=None, headers=None, checkcode=None, onlyif=None, implied_deps=None, require_headers=True, pkg=None, set_target=True): @@ -129,6 +131,8 @@ def CHECK_BUNDLED_SYSTEM(conf, libname, minversion='0.0.0', tries by testing for a specified function in the specified lib ''' # We always do a logic validation of 'onlyif' first + if version_blacklist is None: + version_blacklist = [] missing = [] if onlyif: for l in samba_utils.TO_LIST(onlyif): diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 17a188f5036..40c7b866fba 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -899,10 +899,12 @@ def SAMBA_GENERATOR(bld, name, rule, source='', target='', private_headers=None, header_path=None, vars=None, - dep_vars=[], + dep_vars=None, always=False): '''A generic source generator target''' + if dep_vars is None: + dep_vars = [] if not SET_TARGET_TYPE(bld, name, 'GENERATOR'): return |