From f9d6bc97b003249a9e0ebb222ba3ee6a7bea1caa Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Sat, 3 Jun 2017 11:50:26 +0200 Subject: [PATCH 1/2] Revert "waf: disable-python - align talloc's wscript" This reverts commit dcba0b19757b64164577722976b3da7622ff3955. --- lib/talloc/wscript | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/talloc/wscript b/lib/talloc/wscript index df7e6be55939a1aa9004e2decb65768387fb4b60..af939104a173208a0e9206b721a514d5b752a655 100644 --- a/lib/talloc/wscript +++ b/lib/talloc/wscript @@ -32,6 +32,9 @@ def set_options(opt): opt.add_option('--enable-talloc-compat1', help=("Build talloc 1.x.x compat library [False]"), action="store_true", dest='TALLOC_COMPAT1', default=False) + opt.add_option('--disable-python', + help=("disable the pytalloc module"), + action="store_true", dest='disable_python', default=False) def configure(conf): @@ -43,6 +46,8 @@ def configure(conf): conf.define('TALLOC_BUILD_VERSION_MINOR', int(VERSION.split('.')[1])) conf.define('TALLOC_BUILD_VERSION_RELEASE', int(VERSION.split('.')[2])) + conf.env.disable_python = getattr(Options.options, 'disable_python', False) + conf.env.TALLOC_COMPAT1 = False if conf.env.standalone_talloc: conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1 @@ -137,7 +142,7 @@ def build(bld): private_library=private_library, manpages='man/talloc.3') - if not bld.CONFIG_SET('USING_SYSTEM_PYTALLOC_UTIL'): + if not bld.CONFIG_SET('USING_SYSTEM_PYTALLOC_UTIL') and not bld.env.disable_python: for env in bld.gen_python_environments(['PKGCONFIGDIR']): name = bld.pyembed_libname('pytalloc-util') @@ -151,19 +156,16 @@ def build(bld): abi_match='pytalloc_* _pytalloc_*', private_library=private_library, public_headers=('' if private_library else 'pytalloc.h'), - pc_files='pytalloc-util.pc', - enabled=bld.PYTHON_BUILD_IS_ENABLED() + pc_files='pytalloc-util.pc' ) bld.SAMBA_PYTHON('pytalloc', 'pytalloc.c', deps='talloc ' + name, - enabled=bld.PYTHON_BUILD_IS_ENABLED(), realname='talloc.so') bld.SAMBA_PYTHON('test_pytalloc', 'test_pytalloc.c', deps='pytalloc', - enabled=bld.PYTHON_BUILD_IS_ENABLED(), realname='_test_pytalloc.so', install=False) -- 2.13.0