mirror of
https://git.yoctoproject.org/poky
synced 2026-06-02 13:29:49 +00:00
xtrans: Fix multilib .pc file conflict
Error: Transaction check error: file /usr/share/pkgconfig/xtrans.pc from install of lib32-xtrans-dev-1:1.3.5-r0.core2_32 conflicts with file from package xtrans-dev-1:1.3.5-r0.core2_64 [YOCTO #12511] (From OE-Core rev: e20da6dec99c4d2e6b803b07f8f79af0c54d1396) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -0,0 +1,18 @@
|
|||||||
|
The xtrans.pc file is installed into a non-arch directory yet contains libdir
|
||||||
|
which can vary depending on which multilib is configured. The .pc file does
|
||||||
|
not require libdir so remove this to fix multilib builds.
|
||||||
|
|
||||||
|
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
||||||
|
Upstream-Status: Pending
|
||||||
|
|
||||||
|
Index: xtrans-1.3.5/xtrans.pc.in
|
||||||
|
===================================================================
|
||||||
|
--- xtrans-1.3.5.orig/xtrans.pc.in
|
||||||
|
+++ xtrans-1.3.5/xtrans.pc.in
|
||||||
|
@@ -1,6 +1,5 @@
|
||||||
|
prefix=@prefix@
|
||||||
|
exec_prefix=@exec_prefix@
|
||||||
|
-libdir=@libdir@
|
||||||
|
includedir=@includedir@
|
||||||
|
|
||||||
|
Name: XTrans
|
||||||
@@ -12,6 +12,8 @@ require xorg-lib-common.inc
|
|||||||
LICENSE = "MIT & MIT-style"
|
LICENSE = "MIT & MIT-style"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=49347921d4d5268021a999f250edc9ca"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=49347921d4d5268021a999f250edc9ca"
|
||||||
|
|
||||||
|
SRC_URI += "file://multilibfix.patch"
|
||||||
|
|
||||||
PE = "1"
|
PE = "1"
|
||||||
|
|
||||||
RDEPENDS_${PN}-dev = ""
|
RDEPENDS_${PN}-dev = ""
|
||||||
|
|||||||
Reference in New Issue
Block a user