From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 29 Dec 2023 10:04:59 +0000 (+0000)
Subject: wscript: use opt.PRIVATE_EXTENSION_DEFAULT('private-samba')
X-Git-Tag: talloc-2.4.2~156
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=f22df59b0655f9bb812c39734782b0ff3c71c954;p=samba.git

wscript: use opt.PRIVATE_EXTENSION_DEFAULT('private-samba')

The problem was that we used opt.PRIVATE_EXTENSION_DEFAULT('samba4') and
libndr as private will become libndr-samba4 and that already exists as
libndr-samba4 as we don't append the extension if it's already there.

So meant with --private-libraries=ALL we hit the following problem:

$ ./configure --private-libraries=ALL
$ make smbd/smbd
Waf: Leaving directory `/samba/bin/default'
Task dependency cycle in "run_after" constraints:
{task ...: cshlib dcerpc-samba4.empty.c.12.o,ndr_winbind_c.c.229.o -> libdcerpc-samba4.so}
make: *** [Makefile:131: smbd/smbd] Error 1

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15545

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Björn Jacke <bjacke@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/wscript b/wscript
index f144d9a421c..770b9bcf9af 100644
--- a/wscript
+++ b/wscript
@@ -35,7 +35,7 @@ def system_mitkrb5_callback(option, opt, value, parser):
 
 def options(opt):
     opt.BUILTIN_DEFAULT('NONE')
-    opt.PRIVATE_EXTENSION_DEFAULT('samba4')
+    opt.PRIVATE_EXTENSION_DEFAULT('private-samba')
     opt.RECURSE('lib/replace')
     opt.RECURSE('dynconfig')
     opt.RECURSE('packaging')