diff options
| author | Kai Kang <kai.kang@windriver.com> | 2019-09-04 05:35:54 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-09-07 07:47:24 +0100 |
| commit | 8c93226dce124f943a54ff32edefd10eb18fb794 (patch) | |
| tree | f800d8e38b82da014afe1b23e3e2e69e4a0fe286 /meta | |
| parent | 944a5b054c8a142ef524bafb228f2c79d55372e9 (diff) | |
| download | poky-8c93226dce124f943a54ff32edefd10eb18fb794.tar.gz | |
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>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-extended/texinfo/texinfo_6.5.bb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-extended/texinfo/texinfo_6.5.bb b/meta/recipes-extended/texinfo/texinfo_6.5.bb index f966457f88..50eae77ad0 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 | |||
| 42 | 42 | ||
| 43 | tex_texinfo = "texmf/tex/texinfo" | 43 | tex_texinfo = "texmf/tex/texinfo" |
| 44 | 44 | ||
| 45 | inherit gettext autotools | 45 | inherit gettext autotools multilib_script |
| 46 | |||
| 47 | MULTILIB_SCRIPTS = "${PN}:${bindir}/texi2any" | ||
| 46 | 48 | ||
| 47 | EXTRA_AUTORECONF += "-I ${S}/gnulib/m4" | 49 | EXTRA_AUTORECONF += "-I ${S}/gnulib/m4" |
| 48 | 50 | ||