waf: Don't link python modules against libpython2.x, consistent with other Python...

Rather, rely just on waf's pyext feature. This fixes a warning from dh_python2.

diff --git a/buildtools/wafsamba/samba_python.py b/buildtools/wafsamba/samba_python.py
index e9afa939a3e9ee614c26de32fd20b3235071a962..f46aacce4706abb22a75402ad6a46a7c8b8777d1 100644 (file)
--- 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 876cec52878e639cdcf4c302fee49e6b9d172816..0a120da0d27f7ed562d907bc9b48e9e06b157170 100644 (file)
--- 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 540f3b7bb7e7f4282f8879233beb241c67fb1d94..8879f759bad789e9647437722c2a64146259595c 100644 (file)
--- 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',