diff options
| author |   Wang Mingyu <wangmy@fujitsu.com> | 2023-03-23 09:59:56 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-03-23 22:38:41 +0000 |
| commit | 4876189dd2ae5a04a296b11b537b9f613159c6bf (patch) | |
| tree | 52d75c3f6b38030e918d9b020df05d61516eddad /meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb | |
| parent | 369fee186d6916322b9be9d936b654d0c5910cb3 (diff) | |
| download | openembedded-core-contrib-4876189dd2ae5a04a296b11b537b9f613159c6bf.tar.gz | |
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>
Diffstat (limited to 'meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb')
| -rw-r--r-- | meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb | 1 |
1 files changed, 1 insertions, 0 deletions
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" |