diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-06-29 08:02:16 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-06-29 17:46:09 +0100 |
| commit | 1b8a2fd5db1e2dab3844396c7382228a6ab3b4c3 (patch) | |
| tree | e9b75d2a92b4ef6053517e6fd7aadb67b2320943 | |
| parent | d22fbb0f09e055e58c8f22ef3d112658a96226dd (diff) | |
| download | openembedded-core-contrib-1b8a2fd5db1e2dab3844396c7382228a6ab3b4c3.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]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-graphics/xorg-lib/xtrans/multilibfix.patch | 18 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb | 2 |
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 @@ +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 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 LICENSE = "MIT & MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=49347921d4d5268021a999f250edc9ca" +SRC_URI += "file://multilibfix.patch" + PE = "1" RDEPENDS_${PN}-dev = "" |