mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 13:09:50 +00:00
Code Issues Projects Releases Wiki Activity

xtrans: Fix multilib .pc file conflict

Browse Source 
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:
Richard Purdie
2018-06-29 08:02:16 +00:00
parent 69b588ea2a
commit 0609f4fee3
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-graphics/xorg-lib/xtrans/multilibfix.patch
+18
View File
@@ -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