xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Jonathan Creekmore <jonathan.creekmore@gmail.com>
To: xen-devel@lists.xenproject.org
Cc: Jonathan Creekmore <jonathan.creekmore@gmail.com>,
	dave.scott@eu.citrix.com
Subject: [PATCH] oxenstored: link in the systemd system library
Date: Wed, 22 Jul 2015 17:02:39 -0500	[thread overview]
Message-ID: <1437602559-12233-1-git-send-email-jonathan.creekmore@gmail.com> (raw)

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.

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
-- 
2.1.4

             reply	other threads:[~2015-07-22 22:02 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-22 22:02 Jonathan Creekmore [this message]
2015-07-23  8:41 ` [PATCH] oxenstored: link in the systemd system library Ian Campbell
2015-07-23 13:40   ` [PATCH v2] " Jonathan Creekmore
2015-07-23 14:00     ` Ian Campbell
2015-07-23 14:03       ` Jonathan Creekmore
2015-07-23 14:06         ` Ian Campbell
2015-07-24 11:04       ` Ian Campbell
2015-07-23  9:02 ` [PATCH] " Dave Scott

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1437602559-12233-1-git-send-email-jonathan.creekmore@gmail.com \
    --to=jonathan.creekmore@gmail.com \
    --cc=dave.scott@eu.citrix.com \
    --cc=xen-devel@lists.xenproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).