force talloc to be standalone

Forwarded: not-needed

Upstream ships contents of lib/talloc/ as a separate
source of talloc.  Since we build samba anyway, there's
no need to have separate talloc source package, it's
enough to build it during samba build.

Always build talloc as stand-alone library
(instead of being samba-private if in a subdir).

When building as a sub-library within samba, where
libreplace is a private library, libtalloc.so will
have rpath pointing to the private samba dir.  Since
talloc actually does not use anything from libreplace,
just remove the dependency.

Gbp-Pq: Name talloc-standalone.diff

diff --git a/lib/talloc/wscript b/lib/talloc/wscript
index d36d3587480ed9d72d729475478b998d254faa2e..391b90a871ac55c4605835408fc8000aedb91276 100644 (file)
--- a/lib/talloc/wscript
+++ b/lib/talloc/wscript
@@ -27,7 +27,7 @@ def options(opt):
     opt.BUILTIN_DEFAULT('replace')
     opt.PRIVATE_EXTENSION_DEFAULT('talloc', noextension='talloc')
     opt.RECURSE('lib/replace')
-    if opt.IN_LAUNCH_DIR():
+    if opt.IN_LAUNCH_DIR() or True:
         opt.add_option('--enable-talloc-compat1',
                        help=("Build talloc 1.x.x compat library [False]"),
                        action="store_true", dest='TALLOC_COMPAT1', default=False)
@@ -36,7 +36,7 @@ def options(opt):
 def configure(conf):
     conf.RECURSE('lib/replace')
 
-    conf.env.standalone_talloc = conf.IN_LAUNCH_DIR()
+    conf.env.standalone_talloc = conf.IN_LAUNCH_DIR() or True
 
     conf.define('TALLOC_BUILD_VERSION_MAJOR', int(VERSION.split('.')[0]))
     conf.define('TALLOC_BUILD_VERSION_MINOR', int(VERSION.split('.')[1]))
@@ -113,7 +113,7 @@ def build(bld):
 
         bld.SAMBA_LIBRARY('talloc',
                           'talloc.c',
-                          deps='replace',
+                          deps='', # 'replace',
                           provide_builtin_linking=True,
                           abi_directory='ABI',
                           abi_match='talloc* _talloc*',