[oe-commits] [openembedded-core] 01/13: xtrans: Fix multilib .pc file conflict

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit e20da6dec99c4d2e6b803b07f8f79af0c54d1396
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Fri Jun 29 08:02:16 2018 +0000

    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]
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 .../recipes-graphics/xorg-lib/xtrans/multilibfix.patch | 18 ++++++++++++++++++
 meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb         |  2 ++
 2 files changed, 20 insertions(+)

diff --git a/meta/recipes-graphics/xorg-lib/xtrans/multilibfix.patch b/meta/recipes-graphics/xorg-lib/xtrans/multilibfix.patch
new file mode 100644
index 0000000..c513bad
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/xtrans/multilibfix.patch
@@ -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 at 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
diff --git a/meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb b/meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb
index d5b7f1a..200716f 100644
--- a/meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb
+++ b/meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb
@@ -12,6 +12,8 @@ require xorg-lib-common.inc
 LICENSE = "MIT & MIT-style"
 LIC_FILES_CHKSUM = "file://COPYING;md5=49347921d4d5268021a999f250edc9ca"
 
+SRC_URI += "file://multilibfix.patch"
+
 PE = "1"
 
 RDEPENDS_${PN}-dev = ""

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.