Re: [PATCH] oxenstored: link in the systemd system library

[Ian Campbell <ian.campbell@citrix.com>]

On Wed, 2015-07-22 at 17:02 -0500, Jonathan Creekmore wrote:
> If systemd is configured for use AND you are building oxenstored, the 
> C
> systemd library must be linked in to the oxenstored binary instead of
> just into the static ocaml stub.

I can't see where it is linked into the static ocaml stub at all,
compared with tools/ocaml/libs/* there is no LIBS_systemd declared in
tools/ocaml/xenstore/Makefile. AIUI this is supposed to cause the
underlying library to be referenced by the cxma such that you don't
need it at application link time.

It's also the case that we don't seem to link xenstored against any
other libraries in this way, they get picked up via the cxma.

So I think the right fix is probably to set LIBS_systemd, or otherwise
arrange for this argument to be used when creating the systemd.cxma.

Ian.

> 
> Signed-off-by: Jonathan Creekmore <jonathan.creekmore@gmail.com>
> ---
>  tools/ocaml/xenstored/Makefile | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/tools/ocaml/xenstored/Makefile 
> b/tools/ocaml/xenstored/Makefile
> index d861f11..38ca347 100644
> --- a/tools/ocaml/xenstored/Makefile
> +++ b/tools/ocaml/xenstored/Makefile
> @@ -64,9 +64,11 @@ XENSTOREDLIBS = \
>  	-ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/xb 
> $(OCAML_TOPLEVEL)/libs/xb/xenbus.cmxa \
>  	-ccopt -L -ccopt $(XEN_ROOT)/tools/libxc
>  
> +XENSTORED_LDFLAGS-$(CONFIG_SYSTEMD) += -cclib $(SYSTEMD_LIBS)
> +
>  PROGRAMS = oxenstored
>  
> -oxenstored_LIBS = $(XENSTOREDLIBS)
> +oxenstored_LIBS = $(XENSTOREDLIBS) $(XENSTORED_LDFLAGS-y)
>  oxenstored_OBJS = $(OBJS)
>  
>  OCAML_PROGRAM = oxenstored