diff options
| author | Stefan Metzmacher <metze@samba.org> | 2015-08-03 11:39:01 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2015-08-06 00:43:24 +0200 |
| commit | 9d9a767ef24a684ffe6e95bb95ecb80b8fbe11a9 (patch) | |
| tree | 66f38988b57c4969c7272b125f354e4d77c386c5 /buildtools | |
| parent | 711a420eef90026bc08c8630a8ccd0e0a78207ef (diff) | |
| download | samba-9d9a767ef24a684ffe6e95bb95ecb80b8fbe11a9.tar.gz | |
wafsamba: don't add -DSTATIC_%s_MODULES* arguments for SAMBA_LIBRARY(pyembed=True)
Python helper libraries don't have any modules and having something like
'.cpython-34m' in the name, e.g. STATIC_pytalloc-util.cpython-34m_MODULES
breaks the build.
Another way to fix this would be removing PYTHON_SO_ABI_FLAG from the name.
This allows --extra-python=/usr/bin/python3 to work on Ubuntu 14.04.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/wafsamba/samba_deps.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py index d252dc4eef8..beb366be88d 100644 --- a/buildtools/wafsamba/samba_deps.py +++ b/buildtools/wafsamba/samba_deps.py @@ -214,6 +214,9 @@ def add_init_functions(self): if m is not None: modules.append(m) + if 'pyembed' in self.features: + return + sentinel = getattr(self, 'init_function_sentinel', 'NULL') targets = LOCAL_CACHE(bld, 'TARGET_TYPE') |