From: Juergen Gross <jgross@suse.com>
To: xen-devel@lists.xenproject.org
Cc: Juergen Gross <jgross@suse.com>,
wei.liu2@citrix.com, ian.jackson@eu.citrix.com
Subject: [PATCH] tools/xenstore: add libdl dependency to libxenstore
Date: Wed, 7 Mar 2018 11:17:44 +0100 [thread overview]
Message-ID: <20180307101744.32608-1-jgross@suse.com> (raw)
Commit 448c03b3cbe14873ee63 ("tools/xenstore: try to get minimum thread
stack size for watch thread") added a dependency to libdl to
libxenstore.
Add the needed flags to LDLIBS_libxenstore and the pkg-config file of
libxenstore.
Fixes: 448c03b3cbe14873ee63
Signed-off-by: Juergen Gross <jgross@suse.com>
Tested-by: Olaf Hering <olaf@aepfle.de>
---
tools/Rules.mk | 3 +++
tools/xenstore/Makefile | 2 ++
tools/xenstore/xenstore.pc.in | 2 +-
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/tools/Rules.mk b/tools/Rules.mk
index 61515d3063..296b722372 100644
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -149,6 +149,9 @@ CFLAGS_libxenstore = -I$(XEN_XENSTORE)/include $(CFLAGS_xeninclude)
SHDEPS_libxenstore = $(SHLIB_libxentoolcore)
LDLIBS_libxenstore = $(SHDEPS_libxenstore) $(XEN_XENSTORE)/libxenstore$(libextension)
SHLIB_libxenstore = $(SHDEPS_libxenstore) -Wl,-rpath-link=$(XEN_XENSTORE)
+ifeq ($(CONFIG_Linux),y)
+LDLIBS_libxenstore += -ldl
+endif
CFLAGS_libxenstat = -I$(XEN_LIBXENSTAT)
SHDEPS_libxenstat = $(SHLIB_libxenctrl) $(SHLIB_libxenstore)
diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index 0831be0b6f..aeee819748 100644
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -103,6 +103,8 @@ xs.opic: CFLAGS += -DUSE_PTHREAD
ifeq ($(CONFIG_Linux),y)
xs.opic: CFLAGS += -DUSE_DLSYM
libxenstore.so.$(MAJOR).$(MINOR): LDFLAGS += -ldl
+else
+PKG_CONFIG_REMOVE += dl
endif
libxenstore.so.$(MAJOR).$(MINOR): xs.opic xs_lib.opic
diff --git a/tools/xenstore/xenstore.pc.in b/tools/xenstore/xenstore.pc.in
index 6fd72a1f17..4fc37f805b 100644
--- a/tools/xenstore/xenstore.pc.in
+++ b/tools/xenstore/xenstore.pc.in
@@ -7,4 +7,4 @@ Description: The Xenstore library for Xen hypervisor
Version: @@version@@
Cflags: -I${includedir} @@cflagslocal@@
Libs: @@libsflag@@${libdir} -lxenstore
-Requires.private: xenevtchn,xencontrol,xengnttab,xentoolcore
+Requires.private: xenevtchn,xencontrol,xengnttab,xentoolcore,dl
--
2.13.6
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
next reply other threads:[~2018-03-07 10:17 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-07 10:17 Juergen Gross [this message]
2018-03-07 10:29 ` [PATCH] tools/xenstore: add libdl dependency to libxenstore Wei Liu
2018-03-07 11:01 ` Juergen Gross
2018-03-07 11:04 ` Wei Liu
2018-03-07 11:19 ` Ian Jackson
2018-03-07 11:49 ` Juergen Gross
2018-03-07 12:06 ` ian.jackson
2018-03-07 12:15 ` Juergen Gross
2018-03-09 8:36 ` Olaf Hering
2018-03-09 10:00 ` Juergen Gross
2018-03-09 10:23 ` Olaf Hering
2018-03-09 11:08 ` Olaf Hering
2018-03-09 16:12 ` Wei Liu
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=20180307101744.32608-1-jgross@suse.com \
--to=jgross@suse.com \
--cc=ian.jackson@eu.citrix.com \
--cc=wei.liu2@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).