From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Wed, 7 Mar 2018 11:13:19 +0000 (+0000)
Subject: tools/xenstore: Don't link libxenstore against systemd
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~455
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2b0f746d7f63fa8277044a844e0eb5800e565ec3;p=xen.git

tools/xenstore: Don't link libxenstore against systemd

It is only xenstored which uses libsystemd.  Avoid having libxenstore pull
libsystemd into the address space of all of its users.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
---

diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index 0831be0b6f..4473cf60b5 100644
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -15,9 +15,6 @@ CFLAGS += $(CFLAGS_libxentoolcore)
 CFLAGS += -DXEN_LIB_STORED="\"$(XEN_LIB_STORED)\""
 CFLAGS += -DXEN_RUN_STORED="\"$(XEN_RUN_STORED)\""
 
-CFLAGS-$(CONFIG_SYSTEMD)  += $(SYSTEMD_CFLAGS)
-LDFLAGS-$(CONFIG_SYSTEMD) += $(SYSTEMD_LIBS)
-
 CFLAGS  += $(CFLAGS-y)
 LDFLAGS += $(LDFLAGS-y)
 
@@ -74,6 +71,11 @@ xenstored_probes.o: xenstored_solaris.o
 CFLAGS += -DHAVE_DTRACE=1
 endif
 
+ifeq ($(CONFIG_SYSTEMD),y)
+$(XENSTORED_OBJS): CFLAGS += $(SYSTEMD_CFLAGS)
+xenstored: LDFLAGS += $(SYSTEMD_LIBS)
+endif
+
 $(XENSTORED_OBJS): CFLAGS += $(CFLAGS_libxengnttab)
 
 xenstored: $(XENSTORED_OBJS)