wafsamba: don't add -DSTATIC_%s_MODULES* arguments for SAMBA_LIBRARY(pyembed=True)
authorStefan Metzmacher <metze@samba.org>
Mon, 3 Aug 2015 09:39:01 +0000 (11:39 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 5 Aug 2015 22:43:24 +0000 (00:43 +0200)
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>
buildtools/wafsamba/samba_deps.py

index d252dc4eef8bb973920cc4de64e79c9a99af2b85..beb366be88dc1ab1c27b4285fc983e434087bf50 100644 (file)
@@ -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')