From 861b9c66eb211d266c18bf0398c9709428fae6e9 Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Tue, 26 Nov 2024 17:28:51 +0300 Subject: [PATCH] force tdb to be standalone Forwarded: not-needed Upstream ships contents of lib/tdb/ as a separate source of tdb. Since we build samba anyway, there's no need to have separate tdb source package, it's enough to build it during samba build. Always build tdb 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, libtdb.so will have rpath pointing to the private samba dir. Since tdb actually does not use anything from libreplace, just remove the dependency. Gbp-Pq: Name tdb-standalone.diff --- lib/tdb/wscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/tdb/wscript b/lib/tdb/wscript index 812e5987..c8729541 100644 --- a/lib/tdb/wscript +++ b/lib/tdb/wscript @@ -78,7 +78,7 @@ def configure(conf): conf.env.replace_add_global_pthread = True conf.RECURSE('lib/replace') - conf.env.standalone_tdb = conf.IN_LAUNCH_DIR() + conf.env.standalone_tdb = conf.IN_LAUNCH_DIR() or True conf.env.building_tdb = True if not conf.env.standalone_tdb: @@ -122,7 +122,7 @@ def build(bld): if not bld.CONFIG_SET('USING_SYSTEM_TDB'): - tdb_deps = 'replace' + tdb_deps = '' # 'replace' if bld.CONFIG_SET('USE_TDB_MUTEX_LOCKING'): tdb_deps += ' pthread' -- 2.30.2