Changeset 988 for vendor/current/lib/talloc/wscript

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/lib/talloc/wscript (modified) (11 diffs)

vendor/current/lib/talloc/wscript

@@ -2 +2 @@
 
 APPNAME = 'talloc'
-VERSION = '2.0.5'
+VERSION = '2.1.6'
 
 
@@ -13 +13 @@
 srcdir = '.'
 while not os.path.exists(srcdir+'/buildtools') and len(srcdir.split('/')) < 5:
-    srcdir = '../' + srcdir
+    srcdir = srcdir + '/..'
 sys.path.insert(0, srcdir + '/buildtools/wafsamba')
 
@@ -21 +21 @@
 
 # setup what directories to put in a tarball
-samba_dist.DIST_DIRS('lib/talloc:. lib/replace:lib/replace buildtools:buildtools')
+samba_dist.DIST_DIRS("""lib/talloc:. lib/replace:lib/replace
+buildtools:buildtools third_party/waf:third_party/waf""")
 
 
@@ -28 +29 @@
     opt.PRIVATE_EXTENSION_DEFAULT('talloc', noextension='talloc')
     opt.RECURSE('lib/replace')
-    opt.add_option('--enable-talloc-compat1',
-                   help=("Build talloc 1.x.x compat library [False]"),
-                   action="store_true", dest='TALLOC_COMPAT1', default=False)
     if opt.IN_LAUNCH_DIR():
+        opt.add_option('--enable-talloc-compat1',
+                       help=("Build talloc 1.x.x compat library [False]"),
+                       action="store_true", dest='TALLOC_COMPAT1', default=False)
         opt.add_option('--disable-python',
                        help=("disable the pytalloc module"),
@@ -45 +46 @@
 
     if not conf.env.standalone_talloc:
-        if conf.CHECK_BUNDLED_SYSTEM('talloc', minversion=VERSION,
+        if conf.CHECK_BUNDLED_SYSTEM_PKG('talloc', minversion=VERSION,
                                      implied_deps='replace'):
             conf.define('USING_SYSTEM_TALLOC', 1)
-        if conf.CHECK_BUNDLED_SYSTEM('pytalloc-util', minversion=VERSION,
+        if conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION,
                                      implied_deps='talloc replace'):
             conf.define('USING_SYSTEM_PYTALLOC_UTIL', 1)
 
-    conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1
+    conf.env.TALLOC_COMPAT1 = False
+    if conf.env.standalone_talloc:
+        conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1
 
     conf.CHECK_XSLTPROC_MANPAGES()
@@ -58 +61 @@
     if not conf.env.disable_python:
         # also disable if we don't have the python libs installed
-        conf.check_tool('python')
-        conf.check_python_version((2,4,2))
+        conf.SAMBA_CHECK_PYTHON(mandatory=False, version=(2,4,2))
         conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=False)
         if not conf.env.HAVE_PYTHON_H:
@@ -65 +67 @@
             conf.env.disable_python = True
 
+    conf.CHECK_HEADERS('sys/auxv.h')
+    conf.CHECK_FUNCS('getauxval')
+
     conf.SAMBA_CONFIG_H()
+
+    conf.SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS()
 
 
@@ -74 +81 @@
         bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
         bld.env.TALLOC_VERSION = VERSION
-        bld.PKG_CONFIG_FILES('talloc.pc', vnum=VERSION)
         private_library = False
 
@@ -82 +88 @@
                           public_deps='talloc',
                           soname='libtalloc.so.1',
+                          pc_files=[],
+                          public_headers=[],
                           enabled=bld.env.TALLOC_COMPAT1)
 
-        if not bld.env.disable_python:
-            bld.PKG_CONFIG_FILES('pytalloc-util.pc', vnum=VERSION)
+        testsuite_deps = 'talloc'
+        if bld.CONFIG_SET('HAVE_PTHREAD'):
+            testsuite_deps += ' pthread'
+
+        bld.SAMBA_BINARY('talloc_testsuite',
+                         'testsuite_main.c testsuite.c',
+                         testsuite_deps,
+                         install=False)
+
+        bld.SAMBA_BINARY('talloc_test_magic_differs_helper',
+                         'test_magic_differs_helper.c',
+                         'talloc', install=False)
+
     else:
         private_library = True
@@ -98 +117 @@
                           hide_symbols=True,
                           vnum=VERSION,
-                          public_headers='talloc.h',
+                          public_headers=('' if private_library else 'talloc.h'),
+                          pc_files='talloc.pc',
                           public_headers_install=not private_library,
                           private_library=private_library,
-                          manpages='talloc.3')
+                          manpages='man/talloc.3')
 
     if not bld.CONFIG_SET('USING_SYSTEM_PYTALLOC_UTIL') and not bld.env.disable_python:
+        for env in bld.gen_python_environments(['PKGCONFIGDIR']):
+            name = bld.pyembed_libname('pytalloc-util')
 
-        bld.SAMBA_LIBRARY('pytalloc-util',
-            source='pytalloc_util.c',
-            public_deps='talloc',
-            pyext=True,
-            vnum=VERSION,
-            private_library=private_library,
-            public_headers='pytalloc.h'
-            )
-        bld.SAMBA_PYTHON('pytalloc',
-                         'pytalloc.c',
-                         deps='talloc pytalloc-util',
-                         enabled=True,
-                         realname='talloc.so')
+            bld.SAMBA_LIBRARY(name,
+                source='pytalloc_util.c',
+                public_deps='talloc',
+                pyembed=True,
+                vnum=VERSION,
+                hide_symbols=True,
+                abi_directory='ABI',
+                abi_match='pytalloc_* _pytalloc_*',
+                private_library=private_library,
+                public_headers=('' if private_library else 'pytalloc.h'),
+                pc_files='pytalloc-util.pc'
+                )
+            bld.SAMBA_PYTHON('pytalloc',
+                            'pytalloc.c',
+                            deps='talloc ' + name,
+                            enabled=True,
+                            realname='talloc.so')
 
-    if not getattr(bld.env, '_SAMBA_BUILD_', 0) == 4:
-        # s4 already has the talloc testsuite builtin to smbtorture
-        bld.SAMBA_BINARY('talloc_testsuite',
-                         'testsuite_main.c testsuite.c',
-                         deps='talloc',
-                         install=False)
+            bld.SAMBA_PYTHON('test_pytalloc',
+                            'test_pytalloc.c',
+                            deps='pytalloc',
+                            enabled=True,
+                            realname='_test_pytalloc.so',
+                            install=False)
 
 
@@ -133 +159 @@
     ret = samba_utils.RUN_COMMAND(cmd)
     print("testsuite returned %d" % ret)
-    sys.exit(ret)
+    magic_helper_cmd = os.path.join(Utils.g_module.blddir, 'talloc_test_magic_differs_helper')
+    magic_cmd = os.path.join(srcdir, 'lib', 'talloc',
+                             'test_magic_differs.sh')
+
+    magic_ret = samba_utils.RUN_COMMAND(magic_cmd + " " +  magic_helper_cmd)
+    print("magic differs test returned %d" % magic_ret)
+    pyret = samba_utils.RUN_PYTHON_TESTS(['test_pytalloc.py'])
+    print("python testsuite returned %d" % pyret)
+    sys.exit(ret or magic_ret or pyret)
 
 def dist():