summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2011-11-12 05:20:10 +0100
committerJelmer Vernooij <jelmer@samba.org>2011-11-13 18:06:06 +0100
commit312fd94002cd576140e5d90ef70ea2dd053c949a (patch)
tree663a557778993833e1f287f9fa4f6aa93e6d5967
parentc529c12c7d644bb2d7391a5d736ee9e6b12d6ab6 (diff)
downloadsamba-312fd94002cd576140e5d90ef70ea2dd053c949a.tar.gz
samba-312fd94002cd576140e5d90ef70ea2dd053c949a.tar.bz2
samba-312fd94002cd576140e5d90ef70ea2dd053c949a.zip
waf: Don't link python modules against libpython2.x, consistent with other Python modules.
Rather, rely just on waf's pyext feature. This fixes a warning from dh_python2.
-rw-r--r--buildtools/wafsamba/samba_python.py4
-rw-r--r--buildtools/wafsamba/wafsamba.py5
-rw-r--r--source4/scripting/python/wscript_build2
3 files changed, 5 insertions, 6 deletions
diff --git a/buildtools/wafsamba/samba_python.py b/buildtools/wafsamba/samba_python.py
index e9afa939a3..f46aacce47 100644
--- a/buildtools/wafsamba/samba_python.py
+++ b/buildtools/wafsamba/samba_python.py
@@ -45,7 +45,7 @@ def SAMBA_PYTHON(bld, name,
cflags=cflags,
local_include=local_include,
vars=vars,
- pyembed=True,
+ pyext=True,
enabled=enabled)
return
@@ -61,7 +61,7 @@ def SAMBA_PYTHON(bld, name,
local_include=local_include,
vars=vars,
link_name=link_name,
- pyembed=True,
+ pyext=True,
target_type='PYTHON',
install_path='${PYTHONARCHDIR}',
enabled=enabled)
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 876cec5287..0a120da0d2 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -213,9 +213,8 @@ def SAMBA_LIBRARY(bld, libname, source,
features = 'cc cshlib symlink_lib install_lib'
if target_type == 'PYTHON':
features += ' pyext'
- if pyext or pyembed:
- # this is quite strange. we should add pyext feature for pyext
- # but that breaks the build. This may be a bug in the waf python tool
+ allow_undefined_symbols = True
+ if pyembed:
features += ' pyembed'
if abi_directory:
diff --git a/source4/scripting/python/wscript_build b/source4/scripting/python/wscript_build
index 540f3b7bb7..8879f759ba 100644
--- a/source4/scripting/python/wscript_build
+++ b/source4/scripting/python/wscript_build
@@ -5,7 +5,7 @@ bld.SAMBA_LIBRARY('samba_python',
deps='LIBPYTHON pytalloc-util pyrpc_util',
grouping_library=True,
private_library=True,
- pyext=True)
+ pyembed=True)
bld.SAMBA_SUBSYSTEM('LIBPYTHON',
source='modules.c',