[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openembedded-core
Subject:    [OE-core] [PATCH 2/2] xtrans: Fix multilib .pc file conflict
From:       Richard Purdie <richard.purdie () linuxfoundation ! org>
Date:       2018-06-29 16:45:27
Message-ID: 20180629164527.6325-2-richard.purdie () linuxfoundation ! org
[Download RAW message or body]

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

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../xorg-lib/xtrans/multilibfix.patch          | 18 ++++++++++++++++++
 meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 meta/recipes-graphics/xorg-lib/xtrans/multilibfix.patch

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 00000000000..c513bad20e6
--- /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@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 d5b7f1a2c6b..200716fb023 \
                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 = ""
-- 
2.17.1

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[prev in list] [next in list] [prev in thread] [next in thread]