libgnttab contains the complete gntshr support, but the tools build
infrastructure contains dedicated support for gntshr _and_ gnttab.
Remove the gntshr specific flags and switch their users to gnttab
instead.
Signed-off-by: Juergen Gross <jgr...@suse.com>
---
.gitignore | 1 -
tools/Rules.mk | 10 ++--------
tools/libs/gnttab/Makefile | 5 ++---
tools/libs/gnttab/xengntshr.pc.in | 8 --------
tools/libvchan/Makefile | 6 +++---
tools/libvchan/xenvchan.pc.in | 2 +-
tools/libxc/Makefile | 4 ++--
tools/libxc/xencontrol.pc.in | 2 +-
8 files changed, 11 insertions(+), 27 deletions(-)
delete mode 100644 tools/libs/gnttab/xengntshr.pc.in
diff --git a/.gitignore b/.gitignore
index 1378368..35768fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -100,7 +100,6 @@ tools/libs/toollog/xentoollog.pc
tools/libs/evtchn/headers.chk
tools/libs/evtchn/xenevtchn.pc
tools/libs/gnttab/headers.chk
-tools/libs/gnttab/xengntshr.pc
tools/libs/gnttab/xengnttab.pc
tools/libs/call/headers.chk
tools/libs/call/xencall.pc
diff --git a/tools/Rules.mk b/tools/Rules.mk
index a888560..ee972e4 100644
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -107,12 +107,6 @@ SHDEPS_libxengnttab = $(SHLIB_libxentoollog)
LDLIBS_libxengnttab = $(SHDEPS_libxengnttab)
$(XEN_LIBXENGNTTAB)/libxengnttab$(libextension)
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)
-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)
SHDEPS_libxencall =
LDLIBS_libxencall = $(SHDEPS_libxencall)
$(XEN_LIBXENCALL)/libxencall$(libextension)
@@ -131,7 +125,7 @@ SHLIB_libxendevicemodel = $(SHDEPS_libxendevicemodel)
-Wl,-rpath-link=$(XEN_LIB
# code which compiles against libxenctrl get __XEN_TOOLS__ and
# therefore sees the unstable hypercall interfaces.
CFLAGS_libxenctrl = -I$(XEN_LIBXC)/include $(CFLAGS_libxentoollog)
$(CFLAGS_libxenforeignmemory) $(CFLAGS_libxendevicemodel) $(CFLAGS_xeninclude)
-D__XEN_TOOLS__
-SHDEPS_libxenctrl = $(SHLIB_libxentoollog) $(SHLIB_libxenevtchn)
$(SHLIB_libxengnttab) $(SHLIB_libxengntshr) $(SHLIB_libxencall)
$(SHLIB_libxenforeignmemory) $(SHLIB_libxendevicemodel)
+SHDEPS_libxenctrl = $(SHLIB_libxentoollog) $(SHLIB_libxenevtchn)
$(SHLIB_libxengnttab) $(SHLIB_libxencall) $(SHLIB_libxenforeignmemory)
$(SHLIB_libxendevicemodel)
LDLIBS_libxenctrl = $(SHDEPS_libxenctrl) $(XEN_LIBXC)/libxenctrl$(libextension)
SHLIB_libxenctrl = $(SHDEPS_libxenctrl) -Wl,-rpath-link=$(XEN_LIBXC)
@@ -151,7 +145,7 @@ LDLIBS_libxenstat = $(SHDEPS_libxenstat)
$(XEN_LIBXENSTAT)/libxenstat$(libexten
SHLIB_libxenstat = $(SHDEPS_libxenstat) -Wl,-rpath-link=$(XEN_LIBXENSTAT)
CFLAGS_libxenvchan = -I$(XEN_LIBVCHAN)
-SHDEPS_libxenvchan = $(SHLIB_libxentoollog) $(SHLIB_libxenstore)
$(SHLIB_libxenevtchn) $(SHLIB_libxengnttab) $(SHLIB_libxengntshr)
+SHDEPS_libxenvchan = $(SHLIB_libxentoollog) $(SHLIB_libxenstore)
$(SHLIB_libxenevtchn) $(SHLIB_libxengnttab)
LDLIBS_libxenvchan = $(SHDEPS_libxenvchan)
$(XEN_LIBVCHAN)/libxenvchan$(libextension)
SHLIB_libxenvchan = $(SHDEPS_libxenvchan) -Wl,-rpath-link=$(XEN_LIBVCHAN)
diff --git a/tools/libs/gnttab/Makefile b/tools/libs/gnttab/Makefile
index d4841c2..88b3683 100644
--- a/tools/libs/gnttab/Makefile
+++ b/tools/libs/gnttab/Makefile
@@ -26,7 +26,7 @@ ifneq ($(nosharedlibs),y)
LIB += libxengnttab.so
endif
-PKG_CONFIG := xengnttab.pc xengntshr.pc
+PKG_CONFIG := xengnttab.pc
PKG_CONFIG_VERSION := $(MAJOR).$(MINOR)
ifneq ($(CONFIG_LIBXC_MINIOS),y)
@@ -76,7 +76,6 @@ install: build
$(SYMLINK_SHLIB) libxengnttab.so.$(MAJOR)
$(DESTDIR)$(libdir)/libxengnttab.so
$(INSTALL_DATA) include/xengnttab.h $(DESTDIR)$(includedir)
$(INSTALL_DATA) xengnttab.pc $(DESTDIR)$(PKG_INSTALLDIR)
- $(INSTALL_DATA) xengntshr.pc $(DESTDIR)$(PKG_INSTALLDIR)
.PHONY: TAGS
TAGS:
@@ -87,7 +86,7 @@ clean:
rm -rf *.rpm $(LIB) *~ $(DEPS) $(LIB_OBJS) $(PIC_OBJS)
rm -f libxengnttab.so.$(MAJOR).$(MINOR) libxengnttab.so.$(MAJOR)
rm -f headers.chk
- rm -f xengnttab.pc xengntshr.pc
+ rm -f xengnttab.pc
.PHONY: distclean
distclean: clean
diff --git a/tools/libs/gnttab/xengntshr.pc.in
b/tools/libs/gnttab/xengntshr.pc.in
deleted file mode 100644
index 1eb58c2..0000000
--- a/tools/libs/gnttab/xengntshr.pc.in
+++ /dev/null
@@ -1,8 +0,0 @@
-prefix=@@prefix@@
-includedir=@@incdir@@
-libdir=@@libdir@@
-
-Name: Xengntshr
-Description: The Xengntshr library for Xen hypervisor
-Version: @@version@@
-Requires: xengnttab
diff --git a/tools/libvchan/Makefile b/tools/libvchan/Makefile
index b816eb7..5b631cb 100644
--- a/tools/libvchan/Makefile
+++ b/tools/libvchan/Makefile
@@ -10,9 +10,9 @@ NODE_OBJS = node.o
NODE2_OBJS = node-select.o
LIBVCHAN_PIC_OBJS = $(patsubst %.o,%.opic,$(LIBVCHAN_OBJS))
-LIBVCHAN_LIBS = $(LDLIBS_libxenstore) $(LDLIBS_libxengnttab)
$(LDLIBS_libxengntshr) $(LDLIBS_libxenevtchn)
-$(LIBVCHAN_OBJS) $(LIBVCHAN_PIC_OBJS): CFLAGS += $(CFLAGS_libxenstore)
$(CFLAGS_libxengnttab) $(CFLAGS_libxengntshr) $(CFLAGS_libxenevtchn)
-$(NODE_OBJS) $(NODE2_OBJS): CFLAGS += $(CFLAGS_libxengnttab)
$(CFLAGS_libxengntshr) $(CFLAGS_libxenevtchn)
+LIBVCHAN_LIBS = $(LDLIBS_libxenstore) $(LDLIBS_libxengnttab)
$(LDLIBS_libxenevtchn)
+$(LIBVCHAN_OBJS) $(LIBVCHAN_PIC_OBJS): CFLAGS += $(CFLAGS_libxenstore)
$(CFLAGS_libxengnttab) $(CFLAGS_libxenevtchn)
+$(NODE_OBJS) $(NODE2_OBJS): CFLAGS += $(CFLAGS_libxengnttab)
$(CFLAGS_libxenevtchn)
MAJOR = 4.9
MINOR = 0
diff --git a/tools/libvchan/xenvchan.pc.in b/tools/libvchan/xenvchan.pc.in
index 605e42b..6fd1310 100644
--- a/tools/libvchan/xenvchan.pc.in
+++ b/tools/libvchan/xenvchan.pc.in
@@ -7,4 +7,4 @@ Description: The Xenvchan library for Xen hypervisor
Version: @@version@@
Cflags: -I${includedir} @@cflagslocal@@
Libs: @@libsflag@@${libdir} -lxenvchan
-Requires.private: xentoollog,xenstore,xengntshr,xenevtchn,xengnttab
+Requires.private: xentoollog,xenstore,xenevtchn,xengnttab
diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
index d6fa1eb..8ae552f 100644
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -130,7 +130,7 @@ $(CTRL_PIC_OBJS) $(GUEST_PIC_OBJS): CFLAGS += -include
$(XEN_ROOT)/tools/config.
$(CTRL_LIB_OBJS) $(GUEST_LIB_OBJS) \
$(CTRL_PIC_OBJS) $(GUEST_PIC_OBJS): CFLAGS += $(CFLAGS_libxencall)
$(CFLAGS_libxenforeignmemory)
-$(CTRL_LIB_OBJS) $(CTRL_PIC_OBJS): CFLAGS += $(CFLAGS_libxengnttab)
$(CFLAGS_libxengntshr)
+$(CTRL_LIB_OBJS) $(CTRL_PIC_OBJS): CFLAGS += $(CFLAGS_libxengnttab)
LIB := libxenctrl.a
ifneq ($(nosharedlibs),y)
@@ -239,7 +239,7 @@ libxenctrl.so.$(MAJOR): libxenctrl.so.$(MAJOR).$(MINOR)
$(SYMLINK_SHLIB) $< $@
libxenctrl.so.$(MAJOR).$(MINOR): $(CTRL_PIC_OBJS)
- $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG)
-Wl,libxenctrl.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LDLIBS_libxentoollog)
$(LDLIBS_libxenevtchn) $(LDLIBS_libxengnttab) $(LDLIBS_libxengntshr)
$(LDLIBS_libxencall) $(LDLIBS_libxenforeignmemory) $(LDLIBS_libxendevicemodel)
$(PTHREAD_LIBS) $(APPEND_LDFLAGS)
+ $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG)
-Wl,libxenctrl.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LDLIBS_libxentoollog)
$(LDLIBS_libxenevtchn) $(LDLIBS_libxengnttab) $(LDLIBS_libxencall)
$(LDLIBS_libxenforeignmemory) $(LDLIBS_libxendevicemodel) $(PTHREAD_LIBS)
$(APPEND_LDFLAGS)
# libxenguest
diff --git a/tools/libxc/xencontrol.pc.in b/tools/libxc/xencontrol.pc.in
index fdc2530..e653ba2 100644
--- a/tools/libxc/xencontrol.pc.in
+++ b/tools/libxc/xencontrol.pc.in
@@ -7,4 +7,4 @@ Description: The Xencontrol library for Xen hypervisor
Version: @@version@@
Cflags: -I${includedir} @@cflagslocal@@
Libs: @@libsflag@@${libdir} -lxenctrl
-Requires.private:
xenevtchn,xengnttab,xengntshr,xencall,xenforeignmemory,xendevicemodel,xentoollog
+Requires.private:
xenevtchn,xengnttab,xencall,xenforeignmemory,xendevicemodel,xentoollog
--
2.10.2
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
