From: Andrew Bartlett Date: Fri, 15 Feb 2019 03:04:53 +0000 (+1300) Subject: build: Remove manual specification of minimum python version X-Git-Tag: talloc-2.2.0~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a459650054b5500026b6387fb0eb2ef29ced9b5f;p=thirdparty%2Fsamba.git build: Remove manual specification of minimum python version We now used the default of 3.4 from conf.SAMBA_CHECK_PYTHON() Signed-off-by: Andrew Bartlett Reviewed-by: Douglas Bagnall --- diff --git a/ctdb/wscript b/ctdb/wscript index 4adf60046c3..15dd75708f0 100644 --- a/ctdb/wscript +++ b/ctdb/wscript @@ -140,7 +140,7 @@ def configure(conf): if conf.env.standalone_ctdb: conf.SAMBA_CHECK_PERL(mandatory=True) - conf.SAMBA_CHECK_PYTHON(mandatory=False, version=(2,5,0)) + conf.SAMBA_CHECK_PYTHON(mandatory=False) conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=False) if conf.CHECK_FOR_THIRD_PARTY(): diff --git a/lib/talloc/wscript b/lib/talloc/wscript index 81d12f8c054..827ae88498b 100644 --- a/lib/talloc/wscript +++ b/lib/talloc/wscript @@ -62,7 +62,7 @@ def configure(conf): if not conf.env.disable_python: # also disable if we don't have the python libs installed - conf.SAMBA_CHECK_PYTHON(mandatory=False, version=(2,4,2)) + conf.SAMBA_CHECK_PYTHON(mandatory=False) conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=False) if not conf.env.HAVE_PYTHON_H: Logs.warn('Disabling pytalloc-util as python devel libs not found') diff --git a/wscript b/wscript index ff6dae23330..a0a8080b448 100644 --- a/wscript +++ b/wscript @@ -151,8 +151,7 @@ def configure(conf): if not (Options.options.without_ad_dc): raise Errors.WafError('--disable-python requires --without-ad-dc') - conf.SAMBA_CHECK_PYTHON(mandatory=not conf.env.disable_python, - version=(2, 6, 0)) + conf.SAMBA_CHECK_PYTHON(mandatory=not conf.env.disable_python) conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=(not conf.env.disable_python)) if sys.platform == 'darwin' and not conf.env['HAVE_ENVIRON_DECL']: