[PATCH v2 for-4.14] tools: Fix pkg-config file for libxenstore

Andrew Cooper posted 1 patch 3 years ago
Failed in applying to current master (apply log)
tools/xenstore/xenstore.pc.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH v2 for-4.14] tools: Fix pkg-config file for libxenstore
Posted by Andrew Cooper 3 years ago
There are no dependenices on evtchn, ctrl or gnttab.

Fixes: 1b008e99 ("tools: provide pkg-config file for libxenstore")
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Ian Jackson <iwj@xenproject.org>
CC: Wei Liu <wl@xen.org>
CC: Juergen Gross <jgross@suse.com>
CC: Jan Beulich <JBeulich@suse.com>

v2:
 * Drop xenevtchn and xengnttab as well

This has been fixed in Xen 4.15 by the uselibs.mk logic, but 4.14 and older
cause everything linking against libxenstore to also try linking against
libxenctrl.  It also causes RPM to create unexpected dependencies between
subpackages, which is a problem when trying to separate the stable and
unstable libs.
---
 tools/xenstore/xenstore.pc.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/xenstore/xenstore.pc.in b/tools/xenstore/xenstore.pc.in
index 2f64a6b824..2a278b4395 100644
--- a/tools/xenstore/xenstore.pc.in
+++ b/tools/xenstore/xenstore.pc.in
@@ -8,4 +8,4 @@ Version: @@version@@
 Cflags: -I${includedir} @@cflagslocal@@
 Libs: @@libsflag@@${libdir} -lxenstore
 Libs.private: -ldl
-Requires.private: xenevtchn,xencontrol,xengnttab,xentoolcore
+Requires.private: xentoolcore
-- 
2.11.0


Re: [PATCH v2 for-4.14] tools: Fix pkg-config file for libxenstore
Posted by Wei Liu 3 years ago
On Mon, Mar 22, 2021 at 04:38:47PM +0000, Andrew Cooper wrote:
> There are no dependenices on evtchn, ctrl or gnttab.
> 
> Fixes: 1b008e99 ("tools: provide pkg-config file for libxenstore")
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

Acked-by: Wei Liu <wl@xen.org>

Re: [PATCH v2 for-4.14] tools: Fix pkg-config file for libxenstore
Posted by Ian Jackson 3 years ago
Wei Liu writes ("Re: [PATCH v2 for-4.14] tools: Fix pkg-config file for libxenstore"):
> On Mon, Mar 22, 2021 at 04:38:47PM +0000, Andrew Cooper wrote:
> > There are no dependenices on evtchn, ctrl or gnttab.
> > 
> > Fixes: 1b008e99 ("tools: provide pkg-config file for libxenstore")
> > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> 
> Acked-by: Wei Liu <wl@xen.org>

Having slept on this and I am not convinced that this warrants
backporting.  I prefer to take a generally cautious approach to
changes to packaging and the build system, as this is much less
disruptive to downstreams.

Ian.

Re: [PATCH v2 for-4.14] tools: Fix pkg-config file for libxenstore
Posted by Jürgen Groß 3 years ago
On 22.03.21 17:38, Andrew Cooper wrote:
> There are no dependenices on evtchn, ctrl or gnttab.
> 
> Fixes: 1b008e99 ("tools: provide pkg-config file for libxenstore")
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

Reviewed-by: Juergen Gross <jgross@suse.com>


Juergen