Skip to content

Commit

Permalink
wafsamba: don't add -DSTATIC_%s_MODULES* arguments for SAMBA_LIBRARY(…
Browse files Browse the repository at this point in the history
…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 <[email protected]>
Reviewed-by: Andrew Bartlett <[email protected]>
  • Loading branch information
metze-samba authored and abartlet committed Aug 5, 2015
1 parent 711a420 commit 9d9a767
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions buildtools/wafsamba/samba_deps.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down

0 comments on commit 9d9a767

Please sign in to comment.