From: Michael Tokarev <mjt@tls.msk.ru>
Date: Tue, 26 Nov 2024 14:28:51 +0000 (+0300)
Subject: force talloc to be standalone
X-Git-Tag: archive/raspbian/2%4.22.0+dfsg-1+rpi1^2^2~31
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=39538afff9fb63f60ab17d84d334bfbeffd13647;p=samba.git

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 8b5e02d3..0bc3a5c1 100644
--- 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*',