| Message ID | 20200715090140.7590-1-jgross@suse.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | qemu-trad: remove Xen path dependencies | expand |
On 15.07.20 11:01, Juergen Gross wrote: > xen-hhoks.mak contains hard wired paths for the used libraries of > qemu-trad. Replace those by the make variables from Xen's Rules.mk, > which is already included. > > This in turn removes the need to add the runtime link paths of the > libraries the directly used libraries depend on. > > Signed-off-by: Juergen Gross <jgross@suse.com> Ping? Juergen > --- > xen-hooks.mak | 18 ++++-------------- > 1 file changed, 4 insertions(+), 14 deletions(-) > > diff --git a/xen-hooks.mak b/xen-hooks.mak > index a68eba3c..2689db0f 100644 > --- a/xen-hooks.mak > +++ b/xen-hooks.mak > @@ -1,10 +1,8 @@ > -CPPFLAGS+= -I$(XEN_ROOT)/tools/libs/toollog/include > -CPPFLAGS+= -I$(XEN_ROOT)/tools/libs/evtchn/include > -CPPFLAGS+= -I$(XEN_ROOT)/tools/libs/gnttab/include > +XEN_LIBS = evtchn gnttab ctrl guest store > + > CPPFLAGS+= -DXC_WANT_COMPAT_MAP_FOREIGN_API > CPPFLAGS+= -DXC_WANT_COMPAT_DEVICEMODEL_API > -CPPFLAGS+= -I$(XEN_ROOT)/tools/libxc/include > -CPPFLAGS+= -I$(XEN_ROOT)/tools/xenstore/include > +CPPFLAGS += $(foreach lib,$(XEN_LIBS),$(CFLAGS_libxen$(lib))) > CPPFLAGS+= -I$(XEN_ROOT)/tools/include > > SSE2 := $(call cc-option,-msse2,) > @@ -22,15 +20,7 @@ endif > > CFLAGS += $(CMDLINE_CFLAGS) > > -LIBS += -L$(XEN_ROOT)/tools/libs/evtchn -lxenevtchn > -LIBS += -L$(XEN_ROOT)/tools/libs/gnttab -lxengnttab > -LIBS += -L$(XEN_ROOT)/tools/libxc -lxenctrl -lxenguest > -LIBS += -L$(XEN_ROOT)/tools/xenstore -lxenstore > -LIBS += -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/toollog > -LIBS += -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/toolcore > -LIBS += -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/call > -LIBS += -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/foreignmemory > -LIBS += -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/devicemodel > +LIBS += $(foreach lib,$(XEN_LIBS),$(LDLIBS_libxen$(lib))) > > LDFLAGS := $(CFLAGS) $(LDFLAGS) > >
Jürgen Groß writes ("Re: [PATCH] qemu-trad: remove Xen path dependencies"):
> On 15.07.20 11:01, Juergen Gross wrote:
> > xen-hhoks.mak contains hard wired paths for the used libraries of
> > qemu-trad. Replace those by the make variables from Xen's Rules.mk,
> > which is already included.
> >
> > This in turn removes the need to add the runtime link paths of the
> > libraries the directly used libraries depend on.
> >
> > Signed-off-by: Juergen Gross <jgross@suse.com>
>
> Ping?
Reviewed-by: Ian Jackson <ian.jackson@eu.citrix.com>
diff --git a/xen-hooks.mak b/xen-hooks.mak index a68eba3c..2689db0f 100644 --- a/xen-hooks.mak +++ b/xen-hooks.mak @@ -1,10 +1,8 @@ -CPPFLAGS+= -I$(XEN_ROOT)/tools/libs/toollog/include -CPPFLAGS+= -I$(XEN_ROOT)/tools/libs/evtchn/include -CPPFLAGS+= -I$(XEN_ROOT)/tools/libs/gnttab/include +XEN_LIBS = evtchn gnttab ctrl guest store + CPPFLAGS+= -DXC_WANT_COMPAT_MAP_FOREIGN_API CPPFLAGS+= -DXC_WANT_COMPAT_DEVICEMODEL_API -CPPFLAGS+= -I$(XEN_ROOT)/tools/libxc/include -CPPFLAGS+= -I$(XEN_ROOT)/tools/xenstore/include +CPPFLAGS += $(foreach lib,$(XEN_LIBS),$(CFLAGS_libxen$(lib))) CPPFLAGS+= -I$(XEN_ROOT)/tools/include SSE2 := $(call cc-option,-msse2,) @@ -22,15 +20,7 @@ endif CFLAGS += $(CMDLINE_CFLAGS) -LIBS += -L$(XEN_ROOT)/tools/libs/evtchn -lxenevtchn -LIBS += -L$(XEN_ROOT)/tools/libs/gnttab -lxengnttab -LIBS += -L$(XEN_ROOT)/tools/libxc -lxenctrl -lxenguest -LIBS += -L$(XEN_ROOT)/tools/xenstore -lxenstore -LIBS += -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/toollog -LIBS += -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/toolcore -LIBS += -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/call -LIBS += -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/foreignmemory -LIBS += -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/devicemodel +LIBS += $(foreach lib,$(XEN_LIBS),$(LDLIBS_libxen$(lib))) LDFLAGS := $(CFLAGS) $(LDFLAGS)
xen-hhoks.mak contains hard wired paths for the used libraries of qemu-trad. Replace those by the make variables from Xen's Rules.mk, which is already included. This in turn removes the need to add the runtime link paths of the libraries the directly used libraries depend on. Signed-off-by: Juergen Gross <jgross@suse.com> --- xen-hooks.mak | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-)