| Message ID | 20200823093519.18386-10-jgross@suse.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | tools: move most libraries into tools/libs | expand |
Looks fine to me Cc Anthony in case he has any objection. On Sun, Aug 23, 2020 at 11:34:50AM +0200, Juergen Gross wrote: > Since more than three years now qemu is capable to set the needed > include and library paths for the Xen libraries via pkg-config. > > So drop the specification of those paths in tools/Makefile. This will > enable to move libxenctrl away from tools/libxc, as qemu's configure > script has special treatment of this path. > > Signed-off-by: Juergen Gross <jgross@suse.com> > --- > tools/Makefile | 26 +------------------------- > 1 file changed, 1 insertion(+), 25 deletions(-) > > diff --git a/tools/Makefile b/tools/Makefile > index 198b239edc..7c9f9fc900 100644 > --- a/tools/Makefile > +++ b/tools/Makefile > @@ -245,32 +245,8 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find > -DXC_WANT_COMPAT_GNTTAB_API=1 \ > -DXC_WANT_COMPAT_MAP_FOREIGN_API=1 \ > -DXC_WANT_COMPAT_DEVICEMODEL_API=1 \ > - -I$(XEN_ROOT)/tools/include \ > - -I$(XEN_ROOT)/tools/libs/toolcore/include \ > - -I$(XEN_ROOT)/tools/libs/toollog/include \ > - -I$(XEN_ROOT)/tools/libs/evtchn/include \ > - -I$(XEN_ROOT)/tools/libs/gnttab/include \ > - -I$(XEN_ROOT)/tools/libs/foreignmemory/include \ > - -I$(XEN_ROOT)/tools/libs/devicemodel/include \ > - -I$(XEN_ROOT)/tools/libxc/include \ > - -I$(XEN_ROOT)/tools/xenstore/include \ > - -I$(XEN_ROOT)/tools/xenstore/compat/include \ > $(EXTRA_CFLAGS_QEMU_XEN)" \ > - --extra-ldflags="-L$(XEN_ROOT)/tools/libxc \ > - -L$(XEN_ROOT)/tools/xenstore \ > - -L$(XEN_ROOT)/tools/libs/toolcore \ > - -L$(XEN_ROOT)/tools/libs/evtchn \ > - -L$(XEN_ROOT)/tools/libs/gnttab \ > - -L$(XEN_ROOT)/tools/libs/foreignmemory \ > - -L$(XEN_ROOT)/tools/libs/devicemodel \ > - -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/toolcore \ > - -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/toollog \ > - -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/evtchn \ > - -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/gnttab \ > - -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/call \ > - -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/foreignmemory \ > - -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/devicemodel \ > - $(QEMU_UPSTREAM_RPATH)" \ > + --extra-ldflags="$(QEMU_UPSTREAM_RPATH)" \ > --bindir=$(LIBEXEC_BIN) \ > --datadir=$(SHAREDIR)/qemu-xen \ > --localstatedir=$(localstatedir) \ > -- > 2.26.2 >
diff --git a/tools/Makefile b/tools/Makefile index 198b239edc..7c9f9fc900 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -245,32 +245,8 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find -DXC_WANT_COMPAT_GNTTAB_API=1 \ -DXC_WANT_COMPAT_MAP_FOREIGN_API=1 \ -DXC_WANT_COMPAT_DEVICEMODEL_API=1 \ - -I$(XEN_ROOT)/tools/include \ - -I$(XEN_ROOT)/tools/libs/toolcore/include \ - -I$(XEN_ROOT)/tools/libs/toollog/include \ - -I$(XEN_ROOT)/tools/libs/evtchn/include \ - -I$(XEN_ROOT)/tools/libs/gnttab/include \ - -I$(XEN_ROOT)/tools/libs/foreignmemory/include \ - -I$(XEN_ROOT)/tools/libs/devicemodel/include \ - -I$(XEN_ROOT)/tools/libxc/include \ - -I$(XEN_ROOT)/tools/xenstore/include \ - -I$(XEN_ROOT)/tools/xenstore/compat/include \ $(EXTRA_CFLAGS_QEMU_XEN)" \ - --extra-ldflags="-L$(XEN_ROOT)/tools/libxc \ - -L$(XEN_ROOT)/tools/xenstore \ - -L$(XEN_ROOT)/tools/libs/toolcore \ - -L$(XEN_ROOT)/tools/libs/evtchn \ - -L$(XEN_ROOT)/tools/libs/gnttab \ - -L$(XEN_ROOT)/tools/libs/foreignmemory \ - -L$(XEN_ROOT)/tools/libs/devicemodel \ - -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/toolcore \ - -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/toollog \ - -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/evtchn \ - -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/gnttab \ - -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/call \ - -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/foreignmemory \ - -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/devicemodel \ - $(QEMU_UPSTREAM_RPATH)" \ + --extra-ldflags="$(QEMU_UPSTREAM_RPATH)" \ --bindir=$(LIBEXEC_BIN) \ --datadir=$(SHAREDIR)/qemu-xen \ --localstatedir=$(localstatedir) \
Since more than three years now qemu is capable to set the needed include and library paths for the Xen libraries via pkg-config. So drop the specification of those paths in tools/Makefile. This will enable to move libxenctrl away from tools/libxc, as qemu's configure script has special treatment of this path. Signed-off-by: Juergen Gross <jgross@suse.com> --- tools/Makefile | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-)