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
Signed-off-by: Wang Mingyu <[email protected]>
---
...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
diff --git
a/meta/recipes-graphics/xorg-proto/xcb-proto/0001-Fix-install-conflict-when-enable-multilib.patch
b/meta/recipes-graphics/xorg-proto/xcb-proto/0001-Fix-install-conflict-when-enable-multilib.patch
new file mode 100644
index 0000000000..c263a22792
--- /dev/null
+++
b/meta/recipes-graphics/xorg-proto/xcb-proto/0001-Fix-install-conflict-when-enable-multilib.patch
@@ -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
+
diff --git a/meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb
b/meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb
index 4e4472a9c1..e60e7958a7 100644
--- a/meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb
+++ b/meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb
@@ -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"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#178904):
https://lists.openembedded.org/g/openembedded-core/message/178904
Mute This Topic: https://lists.openembedded.org/mt/97770319/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
