waf: only use libsystemd-daemon if linking it actually succeeds

Alexander Bokovoy ab at samba.org
Thu Jun 5 02:56:08 MDT 2014


On Thu, Jun 05, 2014 at 10:09:10AM +0200, Volker Lendecke wrote:
> On Thu, Jun 05, 2014 at 08:20:25AM +0300, Alexander Bokovoy wrote:
> > Hi,
> > 
> > Attached patch should fix a case when there are headers available as
> > systemd/daemon.h but linking with libsystemd-daemon actually fails.
> > 
> > Thanks Reuben Farrelly for the report of failure on Gentoo.
> > -- 
> > / Alexander Bokovoy
> 
> > >From cc1e4e8a54156b3d187483c792ed294089e92bb6 Mon Sep 17 00:00:00 2001
> > From: Alexander Bokovoy <ab at samba.org>
> > Date: Thu, 5 Jun 2014 08:15:13 +0300
> > Subject: [PATCH] WAF: use libsystemd-daemon only if linking actually succeeds
> > 
> > ---
> >  wscript | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/wscript b/wscript
> > index 58af180..a8cdd14 100644
> > --- a/wscript
> > +++ b/wscript
> > @@ -204,7 +204,7 @@ def configure(conf):
> >          conf.CHECK_HEADERS('systemd/sd-daemon.h', lib='systemd-daemon')
> >          conf.CHECK_LIB('systemd-daemon', shlib=True)
> >  
> > -    if conf.CONFIG_SET('HAVE_SYSTEMD_SD_DAEMON_H'):
> > +    if conf.CONFIG_SET('HAVE_SYSTEMD_SD_DAEMON_H') and conf.CONFIG_SET('HAVE_LIBSYSTEMD_DAEMON'):
> >          conf.DEFINE('HAVE_SYSTEMD', '1')
> >          conf.env['ENABLE_SYSTEMD'] = True
> >      else:
> 
> Is it possible to obey the 80-line limit and get a
> signed-off-by? 
> 
> With those two, Reviewed-by: Volker Lendecke <vl at samba.org>
Done, updated patch attached.

-- 
/ Alexander Bokovoy
-------------- next part --------------
>From 871ef5ab46eb0e9c0d7df91b22951078cc7a2f23 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <ab at samba.org>
Date: Thu, 5 Jun 2014 08:15:13 +0300
Subject: [PATCH] WAF: use libsystemd-daemon only if linking actually succeeds

Signed-off-by: Alexander Bokovoy <ab at samba.org>
---
 wscript | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/wscript b/wscript
index 58af180..cf4e93b 100644
--- a/wscript
+++ b/wscript
@@ -204,7 +204,8 @@ def configure(conf):
         conf.CHECK_HEADERS('systemd/sd-daemon.h', lib='systemd-daemon')
         conf.CHECK_LIB('systemd-daemon', shlib=True)
 
-    if conf.CONFIG_SET('HAVE_SYSTEMD_SD_DAEMON_H'):
+    if (conf.CONFIG_SET('HAVE_SYSTEMD_SD_DAEMON_H') and
+        conf.CONFIG_SET('HAVE_LIBSYSTEMD_DAEMON')):
         conf.DEFINE('HAVE_SYSTEMD', '1')
         conf.env['ENABLE_SYSTEMD'] = True
     else:
-- 
1.9.3



More information about the samba-technical mailing list