waf: Don't link python modules against libpython2.x, consistent with other Python...
authorJelmer Vernooij <jelmer@samba.org>
Sat, 12 Nov 2011 04:20:10 +0000 (05:20 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 13 Nov 2011 17:06:06 +0000 (18:06 +0100)
Rather, rely just on waf's pyext feature. This fixes a warning from dh_python2.

buildtools/wafsamba/samba_python.py
buildtools/wafsamba/wafsamba.py
source4/scripting/python/wscript_build

index e9afa93..f46aacc 100644 (file)
@@ -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)
index 876cec5..0a120da 100644 (file)
@@ -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:
index 540f3b7..8879f75 100644 (file)
@@ -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',