diff mbox series

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

Message ID 20210322162013.12639-1-andrew.cooper3@citrix.com (mailing list archive)
State Superseded
Headers show
Series [for-4.14] tools: Fix pkg-config file for libxenstore | expand

Commit Message

Andrew Cooper March 22, 2021, 4:20 p.m. UTC
There is no dependency on libxenctrl.

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>

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(-)

Comments

Jürgen Groß March 22, 2021, 4:32 p.m. UTC | #1
On 22.03.21 17:20, Andrew Cooper wrote:
> There is no dependency on libxenctrl.
> 
> 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>
> 
> 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..98c3f1ab39 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: xenevtchn,xengnttab,xentoolcore

Any reason you are keeping xenevtchn and xengnttab?


Juergen
Andrew Cooper March 22, 2021, 4:35 p.m. UTC | #2
On 22/03/2021 16:32, Jürgen Groß wrote:
> On 22.03.21 17:20, Andrew Cooper wrote:
>> There is no dependency on libxenctrl.
>>
>> 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>
>>
>> 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..98c3f1ab39 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: xenevtchn,xengnttab,xentoolcore
>
> Any reason you are keeping xenevtchn and xengnttab?

Oh - good point.  I misread uselibs.  Its only toolcore who's dependency
remains in 4.15.

I'll send out a v2.

~Andrew
diff mbox series

Patch

diff --git a/tools/xenstore/xenstore.pc.in b/tools/xenstore/xenstore.pc.in
index 2f64a6b824..98c3f1ab39 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: xenevtchn,xengnttab,xentoolcore