Skip to contentSkip to conversation

xcb-proto: Fix install conflict when enable multilib.

PATCH Superseded [email protected] 2 participants 5 messages Mar 22, 2023 1 message not in the archive

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 xcb-proto: Fix install conflict when enable multilib.

From: Wang Mingyu <[email protected]>

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

---
 ...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
meta/recipes-graphics/xorg-proto/xcb-proto/0001-Fix-install-conflict-when-enable-multilib.patch new file +27 -0
new file mode 100644
index 0000000000..c263a22792
@@ -0,0 +1,27 @@
+From fc28149b6b198042c8d29e0931415adad7ed3231 Mon Sep 17 00:00:00 2001
+From: Wang Mingyu <[email protected]>
+Date: Thu, 16 Mar 2023 08:03:47 +0000
+Subject: [PATCH] Fix install conflict when enable multilib.
+
+Upstream-Status: Pending
+
+Signed-off-by: Wang Mingyu <[email protected]>
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 8b57a83..580f5bc 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,6 +1,6 @@
+ SUBDIRS = src xcbgen
+ 
+-pkgconfigdir = $(datarootdir)/pkgconfig
++pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = xcb-proto.pc
+ 
+ EXTRA_DIST=doc xcb-proto.pc.in autogen.sh README.md
+-- 
+2.34.1
+
meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb +1 -0
index 4e4472a9c1..e60e7958a7 100644
@@ -13,6 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7 \
 
 SRC_URI = "https://xorg.freedesktop.org/archive/individual/proto/${BP}.tar.xz \
            file://0001-xcb-proto.pc.in-reinstate-libdir.patch \
+           file://0001-Fix-install-conflict-when-enable-multilib.patch \
            "
 SRC_URI[sha256sum] = "7072beb1f680a2fe3f9e535b797c146d22528990c72f63ddb49d2f350a3653ed"
 
Signature · 1 line
2.34.1
#1 lore raw

meta/recipes-graphics/xorg-proto/xcb-proto/0001-Fix-install-conflict-when-enable-multilib.patch line 6

Quoted 3 lines · wangmy
meta/recipes-graphics/xorg-proto/xcb-proto/0001-Fix-install-conflict-when-enable-multilib.patch new file +3 -0
+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

#2 lore raw

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: [email protected]
http://www.fujitsu.com/cn/fnst/

Quoted 26 lines

-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of Alexander Kanavin
Sent: Wednesday, March 22, 2023 2:18 PM
To: Wang, Mingyu/王 鸣瑜 <[email protected]>
Cc: [email protected]
Subject: Re: [OE-core] [PATCH V3] xcb-proto: Fix install conflict when enable multilib.

meta/recipes-graphics/xorg-proto/xcb-proto/0001-Fix-install-conflict-when-enable-multilib.patch line 6

Quoted 3 lines · wangmy
meta/recipes-graphics/xorg-proto/xcb-proto/0001-Fix-install-conflict-when-enable-multilib.patch new file +3 -0
+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

#3 lore raw

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

Quoted 45 lines · On Wed, 22 Mar 2023 at 08:52, [email protected] <[email protected]> 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: [email protected]
http://www.fujitsu.com/cn/fnst/

Quoted 26 lines

-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of Alexander Kanavin
Sent: Wednesday, March 22, 2023 2:18 PM
To: Wang, Mingyu/王 鸣瑜 <[email protected]>
Cc: [email protected]
Subject: Re: [OE-core] [PATCH V3] xcb-proto: Fix install conflict when enable multilib.

meta/recipes-graphics/xorg-proto/xcb-proto/0001-Fix-install-conflict-when-enable-multilib.patch line 6

Quoted 3 lines · wangmy
meta/recipes-graphics/xorg-proto/xcb-proto/0001-Fix-install-conflict-when-enable-multilib.patch new file +3 -0
+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

A message that is not in the archive (sent off-list or not yet received): [email protected]

#5 lore raw

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

Quoted 62 lines · Alexander Kanavin via lists.openembedded.org

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

Quoted 5 lines · On Wed, 22 Mar 2023 at 08:52, [email protected] <[email protected]> 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.

Quoted 40 lines

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: [email protected]
http://www.fujitsu.com/cn/fnst/

Quoted 26 lines

-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of Alexander Kanavin
Sent: Wednesday, March 22, 2023 2:18 PM
To: Wang, Mingyu/王 鸣瑜 <[email protected]>
Cc: [email protected]
Subject: Re: [OE-core] [PATCH V3] xcb-proto: Fix install conflict when enable multilib.

meta/recipes-graphics/xorg-proto/xcb-proto/0001-Fix-install-conflict-when-enable-multilib.patch line 6

Quoted 3 lines · wangmy
meta/recipes-graphics/xorg-proto/xcb-proto/0001-Fix-install-conflict-when-enable-multilib.patch new file +3 -0
+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: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-