[OE-core] [PATCH] atk: Correct multilib conflict in header.

Jeremy Puhlman jpuhlman at mvista.com
Wed Jun 13 20:15:05 UTC 2018


The headers don't contain any code differences, but they include the full paths
to the build location in the header file. Removing the build location resolves
the install conflict.

Error: Transaction check error:
  file /usr/include/atk-1.0/atk/atk-enum-types.h conflicts between attempted installs of atk-dev-2.28.1-r0.corei7_64 and lib32-atk-dev-2.28.1-r0.i586
---
 meta/recipes-support/atk/atk_2.28.1.bb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta/recipes-support/atk/atk_2.28.1.bb b/meta/recipes-support/atk/atk_2.28.1.bb
index 657c69d..aedb036 100644
--- a/meta/recipes-support/atk/atk_2.28.1.bb
+++ b/meta/recipes-support/atk/atk_2.28.1.bb
@@ -33,3 +33,8 @@ SRC_URI[archive.sha256sum] = "cd3a1ea6ecc268a2497f0cd018e970860de24a6d42086919d6
 
 BBCLASSEXTEND = "native"
 
+do_install_append () {
+   if [ -e ${D}${includedir}/atk-1.0/atk/atk-enum-types.h ] ; then
+      sed -i ${D}${includedir}/atk-1.0/atk/atk-enum-types.h -e "s,${B},,"
+   fi
+}
-- 
2.6.4




More information about the Openembedded-core mailing list