summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-lib
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-29 08:02:16 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-02 21:37:47 +0100
commit0609f4fee30494792d7c5b9e9113a6275dc93d1c (patch)
treeb123ffad3ab0701eb7f3a9aa44466337d959e959 /meta/recipes-graphics/xorg-lib
parent69b588ea2ad37f6c798aee8e49c5b375e52b7e81 (diff)
downloadpoky-0609f4fee30494792d7c5b9e9113a6275dc93d1c.tar.gz
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>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib')
-rw-r--r--meta/recipes-graphics/xorg-lib/xtrans/multilibfix.patch18
-rw-r--r--meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb2
2 files changed, 20 insertions, 0 deletions
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 0000000000..c513bad20e
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/xtrans/multilibfix.patch
@@ -0,0 +1,18 @@
1The xtrans.pc file is installed into a non-arch directory yet contains libdir
2which can vary depending on which multilib is configured. The .pc file does
3not require libdir so remove this to fix multilib builds.
4
5Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
6Upstream-Status: Pending
7
8Index: xtrans-1.3.5/xtrans.pc.in
9===================================================================
10--- xtrans-1.3.5.orig/xtrans.pc.in
11+++ xtrans-1.3.5/xtrans.pc.in
12@@ -1,6 +1,5 @@
13 prefix=@prefix@
14 exec_prefix=@exec_prefix@
15-libdir=@libdir@
16 includedir=@includedir@
17
18 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 d5b7f1a2c6..200716fb02 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
12LICENSE = "MIT & MIT-style" 12LICENSE = "MIT & MIT-style"
13LIC_FILES_CHKSUM = "file://COPYING;md5=49347921d4d5268021a999f250edc9ca" 13LIC_FILES_CHKSUM = "file://COPYING;md5=49347921d4d5268021a999f250edc9ca"
14 14
15SRC_URI += "file://multilibfix.patch"
16
15PE = "1" 17PE = "1"
16 18
17RDEPENDS_${PN}-dev = "" 19RDEPENDS_${PN}-dev = ""