From: Kai Kang <kai.kang@windriver.com>
Date: Wed, 4 Sep 2019 09:35:54 +0000 (-0400)
Subject: texinfo: fix multilib file confliction
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c93226dce124f943a54ff32edefd10eb18fb794;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

texinfo: fix multilib file confliction

Inherit multilib_script to fix file confliction when mutlilib enabled.

| Error: Transaction check error:
|   file /usr/bin/texi2any conflicts between attempted installs of
    lib32-texinfo-6.5-r0.core2_32 and texinfo-6.5-r0.core2_64

(From OE-Core rev: 08b6a12e674f7a202bb29fbb465997e8303ccb5d)

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-extended/texinfo/texinfo_6.5.bb b/meta/recipes-extended/texinfo/texinfo_6.5.bb
index f966457f881..50eae77ad0a 100644
--- a/meta/recipes-extended/texinfo/texinfo_6.5.bb
+++ b/meta/recipes-extended/texinfo/texinfo_6.5.bb
@@ -42,7 +42,9 @@ SRC_URI[sha256sum] = "d34272e4042c46186ddcd66bd5d980c0ca14ff734444686ccf8131f6ec
 
 tex_texinfo = "texmf/tex/texinfo"
 
-inherit gettext autotools
+inherit gettext autotools multilib_script
+
+MULTILIB_SCRIPTS = "${PN}:${bindir}/texi2any"
 
 EXTRA_AUTORECONF += "-I ${S}/gnulib/m4"