diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-06-29 08:02:16 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-02 09:35:02 +0100 |
commit | e20da6dec99c4d2e6b803b07f8f79af0c54d1396 (patch) | |
tree | 5eb6aef85422174225005a5ad6652f006436527a /meta/recipes-graphics/xorg-lib/xtrans | |
parent | bbb5e55abd0e628a5b0dae90d5eace0a2483f1fc (diff) | |
download | openembedded-core-contrib-e20da6dec99c4d2e6b803b07f8f79af0c54d1396.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>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib/xtrans')
-rw-r--r-- | meta/recipes-graphics/xorg-lib/xtrans/multilibfix.patch | 18 |
1 files changed, 18 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 |