Patches for bug #11458

[Andreas Schneider]

On Saturday 29 August 2015 11:10:14 Stefan Metzmacher wrote:
> Hi Jelmer,
> 
> > On Thu, Aug 27, 2015 at 08:53:58PM +0200, Stefan Metzmacher wrote:
> >> From 550eb499fddbf4846277cf51ea9c28f167c64ad0 Mon Sep 17 00:00:00 2001
> >> From: Stefan Metzmacher <metze at samba.org>
> >> Date: Thu, 27 Aug 2015 11:14:51 +0200
> >> Subject: [PATCH 1/5] ldb:wscript: make it possible to build samba with a
> >> 
> >>  system ldb again
> >> 
> >> This fixes a regression in commit
> >> fcf4a891945b22dc6eccdc71fd441f1a879f556a.
> >> 
> >> If we check for 'ldb' later the 'pyldb-util' can't depend on the 'ldb'
> >> check.
> >> 
> >> BUG: https://bugzilla.samba.org/show_bug.cgi?id=11458
> >> 
> >> Signed-off-by: Stefan Metzmacher <metze at samba.org>
> >> ---
> >> 
> >>  lib/ldb/wscript | 4 ++--
> >>  1 file changed, 2 insertions(+), 2 deletions(-)
> >> 
> >> diff --git a/lib/ldb/wscript b/lib/ldb/wscript
> >> index 0e81932..0996f51 100755
> >> --- a/lib/ldb/wscript
> >> +++ b/lib/ldb/wscript
> >> 
> >> @@ -56,11 +56,11 @@ def configure(conf):
> >>      if not conf.env.standalone_ldb:
> >>          if conf.CHECK_BUNDLED_SYSTEM_PKG('pyldb-util',
> >>          minversion=VERSION,
> >> 
> >> -                                     onlyif='talloc tdb tevent ldb',
> >> +                                     onlyif='talloc tdb tevent',
> >> 
> >>                                       implied_deps='replace talloc tdb 
tevent ldb'):
> >>              conf.define('USING_SYSTEM_PYLDB_UTIL', 1)
> > 
> > It means we can end up using the system pyldb-util even if ldb is not
> > available (or unusable). This doesn't seem particularly realistic
> > though.
> > 
> >>              if conf.CHECK_BUNDLED_SYSTEM_PKG('ldb', minversion=VERSION,
> >> 
> >> -                                         onlyif='talloc tdb tevent',
> >> +                                         onlyif='talloc tdb tevent
> >> pyldb-util',>> 
> >>                                           implied_deps='replace talloc 
tdb tevent'):
> >>                  conf.define('USING_SYSTEM_LDB', 1)
> > 
> > This is problematic because it means we will only ever build
> > against the system ldb if pyldb-util is also installed.
> 
> Yes, that's exactly would *your* commit
> fcf4a891945b22dc6eccdc71fd441f1a879f556a
> is about!
> 
> We can't use a system libldb and build our own pyldb-util.
> 
> > E.g. if the system build was built without Python support, we won't
> > use it *at all*.
> 
> The standalone ldb build doesn't have a --disable-python.

This patch fixes the build with system ldb for me.


Pushed to autobuild ...


	-- andreas


-- 
Andreas Schneider                   GPG-ID: CC014E3D
Samba Team                             asn at samba.org
www.samba.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20150831/fc728806/signature.sig>