[V3] xcb-proto: Fix install conflict when enable multilib.

From: Wang Mingyu <wangmy@fujitsu.com>

Error: Transaction test error:
  file /usr/share/pkgconfig/xcb-proto.pc conflicts between attempted installs of lib32-xcb-proto-dev-1.15.2-r0.armv7ahf_neon and xcb-proto-dev-1.15.2-r0.cortexa57

The differences between the two files are as follows:
@@ -2,7 +2,7 @@
 exec_prefix=/usr
 datarootdir=${prefix}/share
 datadir=/usr/share
-libdir=/usr/lib64
+libdir=/usr/lib
 xcbincludedir=${pc_sysrootdir}${datadir}/xcb
 PYTHON_PREFIX=${prefix}
 pythondir=${pc_sysrootdir}${libdir}/python3.11/site-packages

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ...nstall-conflict-when-enable-multilib.patch | 27 +++++++++++++++++++
 .../xorg-proto/xcb-proto_1.15.2.bb            |  1 +
 2 files changed, 28 insertions(+)
 create mode 100644 meta/recipes-graphics/xorg-proto/xcb-proto/0001-Fix-install-conflict-when-enable-multilib.patch

On Wed, 22 Mar 2023 at 03:20, wangmy <wangmy@fujitsu.com> wrote:
> +Subject: [PATCH] Fix install conflict when enable multilib.
> +
> +Upstream-Status: Pending

Please send this upstream first:
https://gitlab.freedesktop.org/xorg/proto/xcbproto/-/merge_requests

There should also be a better commit message, something like "install
.pc file to $libdir, as it refers to it.

This is needed in particular for systems with multiple sets of
libraries (i.e. 32/64 bit).
"

Alex

In xcb-proto's commit history, the previous commit changed libdir to datarootdir.

So maybe it's not appropriate for me to directly change it back.

I'am discussing this issue with the community.
https://lists.freedesktop.org/archives/xcb/2023-March/011429.html
  --
Best Regards
---------------------------------------------------
Wang Mingyu
Development Dept.I
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) No. 6 Wenzhu Road, Nanjing, 210012, China
TEL: +86+25-86630566-8568
COINS: 79988548
FAX: +86+25-83317685
MAIL: wangmy@fujitsu.com
http://www.fujitsu.com/cn/fnst/

> -----Original Message-----
> From: openembedded-core@lists.openembedded.org
> <openembedded-core@lists.openembedded.org> On Behalf Of Alexander
> Kanavin
> Sent: Wednesday, March 22, 2023 2:18 PM
> To: Wang, Mingyu/王 鸣瑜 <wangmy@fujitsu.com>
> Cc: openembedded-core@lists.openembedded.org
> Subject: Re: [OE-core] [PATCH V3] xcb-proto: Fix install conflict when enable
> multilib.
> 
> On Wed, 22 Mar 2023 at 03:20, wangmy <wangmy@fujitsu.com> wrote:
> > +Subject: [PATCH] Fix install conflict when enable multilib.
> > +
> > +Upstream-Status: Pending
> 
> Please send this upstream first:
> https://gitlab.freedesktop.org/xorg/proto/xcbproto/-/merge_requests
> 
> There should also be a better commit message, something like "install .pc file to
> $libdir, as it refers to it.
> 
> This is needed in particular for systems with multiple sets of libraries (i.e. 32/64
> bit).
> "
> 
> Alex

I would suggest you open a pull request anyway, it just needs a clear
explanation why xcb-proto is in fact arch-specific (because it builds
and installs python bindings).

Alex

On Wed, 22 Mar 2023 at 08:52, wangmy@fujitsu.com <wangmy@fujitsu.com> wrote:
>
> In xcb-proto's commit history, the previous commit changed libdir to datarootdir.
>
> So maybe it's not appropriate for me to directly change it back.
>
> I'am discussing this issue with the community.
> https://lists.freedesktop.org/archives/xcb/2023-March/011429.html
>   --
> Best Regards
> ---------------------------------------------------
> Wang Mingyu
> Development Dept.I
> Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) No. 6 Wenzhu Road, Nanjing, 210012, China
> TEL: +86+25-86630566-8568
> COINS: 79988548
> FAX: +86+25-83317685
> MAIL: wangmy@fujitsu.com
> http://www.fujitsu.com/cn/fnst/
>
> > -----Original Message-----
> > From: openembedded-core@lists.openembedded.org
> > <openembedded-core@lists.openembedded.org> On Behalf Of Alexander
> > Kanavin
> > Sent: Wednesday, March 22, 2023 2:18 PM
> > To: Wang, Mingyu/王 鸣瑜 <wangmy@fujitsu.com>
> > Cc: openembedded-core@lists.openembedded.org
> > Subject: Re: [OE-core] [PATCH V3] xcb-proto: Fix install conflict when enable
> > multilib.
> >
> > On Wed, 22 Mar 2023 at 03:20, wangmy <wangmy@fujitsu.com> wrote:
> > > +Subject: [PATCH] Fix install conflict when enable multilib.
> > > +
> > > +Upstream-Status: Pending
> >
> > Please send this upstream first:
> > https://gitlab.freedesktop.org/xorg/proto/xcbproto/-/merge_requests
> >
> > There should also be a better commit message, something like "install .pc file to
> > $libdir, as it refers to it.
> >
> > This is needed in particular for systems with multiple sets of libraries (i.e. 32/64
> > bit).
> > "
> >
> > Alex

Ok, I checked what is going on. We patch automake to define pythondir
in terms of libdir (rather than hardcode 'lib' or query it from python
as automake upstream does):
https://git.yoctoproject.org/poky/tree/meta/recipes-devtools/automake/automake/0001-automake-Update-for-python.m4-to-respect-libdir.patch

This means that anywhere where pythondir is defined, libdir needs to
be defined as well, and the whole thing should not be installed into
libdir and not datadir.

And therefore any patches to make this happen are Upstream-Status:
Inappropriate, and you do not need to send them upstream :-)

So please resubmit here taking this explanation into the commit
message, and maybe notify upstream that they shouldn't worry about it.

Alex

On Wed, 22 Mar 2023 at 08:55, Alexander Kanavin via
lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org>
wrote:
>
> I would suggest you open a pull request anyway, it just needs a clear
> explanation why xcb-proto is in fact arch-specific (because it builds
> and installs python bindings).
>
> Alex
>
> On Wed, 22 Mar 2023 at 08:52, wangmy@fujitsu.com <wangmy@fujitsu.com> wrote:
> >
> > In xcb-proto's commit history, the previous commit changed libdir to datarootdir.
> >
> > So maybe it's not appropriate for me to directly change it back.
> >
> > I'am discussing this issue with the community.
> > https://lists.freedesktop.org/archives/xcb/2023-March/011429.html
> >   --
> > Best Regards
> > ---------------------------------------------------
> > Wang Mingyu
> > Development Dept.I
> > Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) No. 6 Wenzhu Road, Nanjing, 210012, China
> > TEL: +86+25-86630566-8568
> > COINS: 79988548
> > FAX: +86+25-83317685
> > MAIL: wangmy@fujitsu.com
> > http://www.fujitsu.com/cn/fnst/
> >
> > > -----Original Message-----
> > > From: openembedded-core@lists.openembedded.org
> > > <openembedded-core@lists.openembedded.org> On Behalf Of Alexander
> > > Kanavin
> > > Sent: Wednesday, March 22, 2023 2:18 PM
> > > To: Wang, Mingyu/王 鸣瑜 <wangmy@fujitsu.com>
> > > Cc: openembedded-core@lists.openembedded.org
> > > Subject: Re: [OE-core] [PATCH V3] xcb-proto: Fix install conflict when enable
> > > multilib.
> > >
> > > On Wed, 22 Mar 2023 at 03:20, wangmy <wangmy@fujitsu.com> wrote:
> > > > +Subject: [PATCH] Fix install conflict when enable multilib.
> > > > +
> > > > +Upstream-Status: Pending
> > >
> > > Please send this upstream first:
> > > https://gitlab.freedesktop.org/xorg/proto/xcbproto/-/merge_requests
> > >
> > > There should also be a better commit message, something like "install .pc file to
> > > $libdir, as it refers to it.
> > >
> > > This is needed in particular for systems with multiple sets of libraries (i.e. 32/64
> > > bit).
> > > "
> > >
> > > Alex
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#178919): https://lists.openembedded.org/g/openembedded-core/message/178919
> Mute This Topic: https://lists.openembedded.org/mt/97770319/1686489
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>