diff options
| author | Noel Power <noel.power@suse.com> | 2018-08-03 16:51:59 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2018-09-16 06:16:20 +0200 |
| commit | 6c62e22c1c751a6a2472a996316656ec5d03aa51 (patch) | |
| tree | 76c1fe1d2cfcafdf3fd74ae47fdf0bbeb9a2a42c /lib | |
| parent | 0df8ef41a336a232d2e348462174434d7d7ec610 (diff) | |
| download | samba-6c62e22c1c751a6a2472a996316656ec5d03aa51.tar.gz | |
PY3: detect talloc_utils (for version of python running the build)
It seems all combinations have potential to fail here :/ however for
the moment making the assumption
* if python2 driving the build you are building against libpython2 (with the option of having python3 as 'extra-python'
* if python3 driving the build you are building against libpython3 (with the option of having python3 as 'extra-python' NOTE: this isn't inforced it probably should be !!!! In a system with python2 and python3 installed it seems waf needs PYTHON env variable to decide which libpython to build against. It's also an option that configure should use that too (to figure out which talloc_util to use or build)
However.... right now I just want the thing to build
Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/talloc/wscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/talloc/wscript b/lib/talloc/wscript index 4a17650c052..a5841b46e4e 100644 --- a/lib/talloc/wscript +++ b/lib/talloc/wscript @@ -77,10 +77,10 @@ def configure(conf): using_system_pytalloc_util = False else: using_system_pytalloc_util = True - if not conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION, + name = 'pytalloc-util' + conf.all_envs['default']['PYTHON_SO_ABI_FLAG'] + if not conf.CHECK_BUNDLED_SYSTEM_PKG(name, minversion=VERSION, implied_deps='talloc replace'): using_system_pytalloc_util = False - # We need to get a pytalloc-util for all the python versions # we are building for if conf.env['EXTRA_PYTHON']: |