force tevent to be standalone

Forwarded: not-needed

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

Always build tevent 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, libtevent.so will
have rpath pointing to the private samba dir.  Since
tevent actually does not use anything from libreplace,
just remove the dependency.

Gbp-Pq: Name tevent-standalone.diff

diff --git a/lib/tevent/wscript b/lib/tevent/wscript
index 317a0c5e0b509031a56c3e8e128c824b453a8d16..d6a4b1165627ba80a0c8859e44ffe7b171e0d344 100644 (file)
--- a/lib/tevent/wscript
+++ b/lib/tevent/wscript
@@ -41,7 +41,7 @@ def configure(conf):
         else:
             conf.define('USING_SYSTEM_CMOCKA', 1)
 
-    conf.env.standalone_tevent = conf.IN_LAUNCH_DIR()
+    conf.env.standalone_tevent = conf.IN_LAUNCH_DIR() or True
 
     if not conf.env.standalone_tevent:
         if conf.CHECK_BUNDLED_SYSTEM_PKG('tevent', minversion=VERSION,
@@ -100,7 +100,7 @@ def build(bld):
         private_library = True
 
     if not bld.CONFIG_SET('USING_SYSTEM_TEVENT'):
-        tevent_deps = 'replace talloc'
+        tevent_deps = 'talloc' # 'replace talloc'
         if bld.CONFIG_SET('HAVE_PTHREAD'):
             tevent_deps += ' pthread'