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 v2 02/17] tools: add missing library flag definitions
Date: Tue, 14 Mar 2017 14:31:09 +0100 [thread overview]
Message-ID: <20170314133124.942-3-jgross@suse.com> (raw)
In-Reply-To: <20170314133124.942-1-jgross@suse.com>
LDLIBS_* and SHLIB_* settings in tools/Rules.mk are sometimes missing
some SHDEPS_* added to them.
Add the missing flags, even if sometimes being empty.
Signed-off-by: Juergen Gross <jgross@suse.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
---
tools/Rules.mk | 27 +++++++++++++++------------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/tools/Rules.mk b/tools/Rules.mk
index 3db59b0..392fb03 100644
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -94,13 +94,13 @@ endif
CFLAGS_libxentoollog = -I$(XEN_LIBXENTOOLLOG)/include $(CFLAGS_xeninclude)
SHDEPS_libxentoollog =
-LDLIBS_libxentoollog = $(XEN_LIBXENTOOLLOG)/libxentoollog$(libextension)
-SHLIB_libxentoollog = -Wl,-rpath-link=$(XEN_LIBXENTOOLLOG)
+LDLIBS_libxentoollog = $(SHDEPS_libxentoollog) $(XEN_LIBXENTOOLLOG)/libxentoollog$(libextension)
+SHLIB_libxentoollog = $(SHDEPS_libxentoollog) -Wl,-rpath-link=$(XEN_LIBXENTOOLLOG)
CFLAGS_libxenevtchn = -I$(XEN_LIBXENEVTCHN)/include $(CFLAGS_xeninclude)
SHDEPS_libxenevtchn =
-LDLIBS_libxenevtchn = $(XEN_LIBXENEVTCHN)/libxenevtchn$(libextension)
-SHLIB_libxenevtchn = -Wl,-rpath-link=$(XEN_LIBXENEVTCHN)
+LDLIBS_libxenevtchn = $(SHDEPS_libxenevtchn) $(XEN_LIBXENEVTCHN)/libxenevtchn$(libextension)
+SHLIB_libxenevtchn = $(SHDEPS_libxenevtchn) -Wl,-rpath-link=$(XEN_LIBXENEVTCHN)
CFLAGS_libxengnttab = -I$(XEN_LIBXENGNTTAB)/include $(CFLAGS_xeninclude)
SHDEPS_libxengnttab = $(SHLIB_libxentoollog)
@@ -109,21 +109,24 @@ SHLIB_libxengnttab = $(SHDEPS_libxengnttab) -Wl,-rpath-link=$(XEN_LIBXENGNTTAB)
# xengntshr_* interfaces are actually part of libxengnttab.so
CFLAGS_libxengntshr = -I$(XEN_LIBXENGNTTAB)/include $(CFLAGS_xeninclude)
-LDLIBS_libxengntshr = $(XEN_LIBXENGNTTAB)/libxengnttab$(libextension)
-SHLIB_libxengntshr = -Wl,-rpath-link=$(XEN_LIBXENGNTTAB)
+SHDEPS_libxengntshr = $(SHDEPS_libxengnttab)
+LDLIBS_libxengntshr = $(SHDEPS_libxengntshr) $(XEN_LIBXENGNTTAB)/libxengnttab$(libextension)
+SHLIB_libxengntshr = $(SHDEPS_libxengntshr) -Wl,-rpath-link=$(XEN_LIBXENGNTTAB)
CFLAGS_libxencall = -I$(XEN_LIBXENCALL)/include $(CFLAGS_xeninclude)
-LDLIBS_libxencall = $(XEN_LIBXENCALL)/libxencall$(libextension)
-SHLIB_libxencall = -Wl,-rpath-link=$(XEN_LIBXENCALL)
+SHDEPS_libxencall =
+LDLIBS_libxencall = $(SHDEPS_libxencall) $(XEN_LIBXENCALL)/libxencall$(libextension)
+SHLIB_libxencall = $(SHDEPS_libxencall) -Wl,-rpath-link=$(XEN_LIBXENCALL)
CFLAGS_libxenforeignmemory = -I$(XEN_LIBXENFOREIGNMEMORY)/include $(CFLAGS_xeninclude)
-LDLIBS_libxenforeignmemory = $(XEN_LIBXENFOREIGNMEMORY)/libxenforeignmemory$(libextension)
-SHLIB_libxenforeignmemory = -Wl,-rpath-link=$(XEN_LIBXENFOREIGNMEMORY)
+SHDEPS_libxenforeignmemory =
+LDLIBS_libxenforeignmemory = $(SHDEPS_libxenforeignmemory) $(XEN_LIBXENFOREIGNMEMORY)/libxenforeignmemory$(libextension)
+SHLIB_libxenforeignmemory = $(SHDEPS_libxenforeignmemory) -Wl,-rpath-link=$(XEN_LIBXENFOREIGNMEMORY)
CFLAGS_libxendevicemodel = -I$(XEN_LIBXENDEVICEMODEL)/include $(CFLAGS_xeninclude)
SHDEPS_libxendevicemodel = $(SHLIB_libxentoollog) $(SHLIB_xencall)
-LDLIBS_libxendevicemodel = $(XEN_LIBXENDEVICEMODEL)/libxendevicemodel$(libextension)
-SHLIB_libxendevicemodel = -Wl,-rpath-link=$(XEN_LIBXENDEVICEMODEL)
+LDLIBS_libxendevicemodel = $(SHDEPS_libxendevicemodel) $(XEN_LIBXENDEVICEMODEL)/libxendevicemodel$(libextension)
+SHLIB_libxendevicemodel = $(SHDEPS_libxendevicemodel) -Wl,-rpath-link=$(XEN_LIBXENDEVICEMODEL)
# code which compiles against libxenctrl get __XEN_TOOLS__ and
# therefore sees the unstable hypercall interfaces.
--
2.10.2
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
next prev parent reply other threads:[~2017-03-14 13:31 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-14 13:31 [PATCH v2 00/17] tools: provide pkg-config files for all libs Juergen Gross
2017-03-14 13:31 ` [PATCH v2 01/17] tools: fix typo in tools/Rules.mk Juergen Gross
2017-03-14 13:31 ` Juergen Gross [this message]
2017-03-14 13:31 ` [PATCH v2 03/17] tools, stubdom: set PKG_CONFIG_DIR in main Makefiles Juergen Gross
2017-03-14 13:31 ` [PATCH v2 04/17] tools: install PKG_INSTALLDIR in tools/Makefile Juergen Gross
2017-03-14 14:11 ` Wei Liu
2017-03-14 13:31 ` [PATCH v2 05/17] tools: add support for additional items in .pc files for local builds Juergen Gross
2017-03-14 13:31 ` [PATCH v2 06/17] tools: provide pkg-config file for libxentoollog Juergen Gross
2017-03-14 13:31 ` [PATCH v2 07/17] tools: provide pkg-config file for libxenevtchn Juergen Gross
2017-03-14 13:31 ` [PATCH v2 08/17] tools: provide pkg-config file for libxengnttab Juergen Gross
2017-03-14 20:06 ` Andrew Cooper
2017-03-15 6:07 ` Juergen Gross
2017-03-15 10:33 ` Andrew Cooper
2017-03-15 10:17 ` Wei Liu
2017-03-15 10:26 ` Juergen Gross
2017-03-15 10:29 ` Wei Liu
2017-03-15 10:32 ` Andrew Cooper
2017-03-14 13:31 ` [PATCH v2 09/17] tools: provide pkg-config file for libxencall Juergen Gross
2017-03-14 13:31 ` [PATCH v2 10/17] tools: provide pkg-config file for libxenforeignmemory Juergen Gross
2017-03-14 13:31 ` [PATCH v2 11/17] tools: provide pkg-config file for libxendevicemodel Juergen Gross
2017-03-14 13:31 ` [PATCH v2 12/17] tools: provide pkg-config file for libxenguest, update the one for libxenctrl Juergen Gross
2017-03-14 13:31 ` [PATCH v2 13/17] tools: provide pkg-config file for libxenstore Juergen Gross
2017-03-14 13:31 ` [PATCH v2 14/17] tools: provide pkg-config file for libxenstat Juergen Gross
2017-03-14 13:31 ` [PATCH v2 15/17] tools: provide pkg-config file for libxenvchan Juergen Gross
2017-03-14 13:31 ` [PATCH v2 16/17] tools: provide pkg-config file for libxenblktapctl Juergen Gross
2017-03-14 13:31 ` [PATCH v2 17/17] tools: adapt xenlight.pc and xlutil.pc to new pkg-config scheme Juergen Gross
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=20170314133124.942-3-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).