]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core.git/commit
xcb-proto: Fix install conflict when enable multilib.
authorWang Mingyu <wangmy@fujitsu.com>
Thu, 23 Mar 2023 01:59:56 +0000 (09:59 +0800)
committerSteve Sakoman <steve@sakoman.com>
Thu, 30 Mar 2023 14:10:26 +0000 (04:10 -1000)
commita9fdbd8d5a2017248f519784e4236b3983e5ecac
tree051cb31eb0e00443bab5edd610002214c6b08546
parent8fe9e9967c47270c869347581dd5c5b31d4fa623
xcb-proto: Fix install conflict when enable multilib.

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>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit 4876189dd2ae5a04a296b11b537b9f613159c6bf)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
meta/recipes-graphics/xorg-proto/xcb-proto/0001-Fix-install-conflict-when-enable-multilib.patch [new file with mode: 0644]
meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb