Re: [Xen-devel] [PATCH] tools/xenstore: add libdl dependency to libxenstore

[Wei Liu <wei.liu2@xxxxxxxxxx>]

On Wed, Mar 07, 2018 at 12:01:25PM +0100, Juergen Gross wrote:
> On 07/03/18 11:17, Juergen Gross wrote:
> > 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@xxxxxxxx>
> > Tested-by: Olaf Hering <olaf@xxxxxxxxx>
> > ---
> >  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
> 
> Uuh, this was wrong. libdl hasn't got a pkgconfig file, so we need to
> add -ldl to Libs.private instead. V2 coming soon...
> 

Luckily I haven't got around to apply it...

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel