[oe-commits] [openembedded-core] 06/13: texinfo: fix multilib file confliction
git at git.openembedded.org
git at git.openembedded.org
Sat Sep 7 06:47:59 UTC 2019
This is an automated email from the git hooks/post-receive script.
rpurdie pushed a commit to branch master
in repository openembedded-core.
commit 08b6a12e674f7a202bb29fbb465997e8303ccb5d
Author: Kai Kang <kai.kang at windriver.com>
AuthorDate: Wed Sep 4 05:35:54 2019 -0400
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
Signed-off-by: Kai Kang <kai.kang at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-extended/texinfo/texinfo_6.5.bb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-extended/texinfo/texinfo_6.5.bb b/meta/recipes-extended/texinfo/texinfo_6.5.bb
index f966457..50eae77 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"
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list