From 9d9a767ef24a684ffe6e95bb95ecb80b8fbe11a9 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 3 Aug 2015 11:39:01 +0200 Subject: [PATCH] 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 Reviewed-by: Andrew Bartlett --- buildtools/wafsamba/samba_deps.py | 3 +++ 1 file changed, 3 insertions(+) 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') -- 2.47.2