Fix --extra-python=/usr/bin/python3 on ubuntu 14.04

Stefan Metzmacher metze at samba.org
Wed Aug 5 14:05:15 UTC 2015


Hi,

here's a fix in order to support --extra-python=/usr/bin/python3
at least on ubuntu 14.04.

Please review and push.
Thanks!
metze
-------------- next part --------------
From 74f78da730ce6f8d015bc075bdbce8f6a239de78 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze at samba.org>
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 <metze at samba.org>
---
 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 d252dc4..beb366b 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')
-- 
1.9.1

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: OpenPGP digital signature
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20150805/129556a7/signature.sig>


More information about the samba-technical mailing list