diff options
| author | Kai Kang <kai.kang@windriver.com> | 2018-09-11 19:25:23 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-13 07:42:28 +0100 |
| commit | d577afd930d2eec46db6805314b8bab7b700841a (patch) | |
| tree | 75006f412cb29bd6dbd3b512ca9d9252787292fc /meta/recipes-support/icu/icu.inc | |
| parent | 1d5b01c956918fe3dec90649fc9d83c38f3afa50 (diff) | |
| download | poky-d577afd930d2eec46db6805314b8bab7b700841a.tar.gz | |
multilib: fix install file conflicts
Fix install files conflicts between multlib packages by inherit multilib_script:
| file /usr/bin/cairo-trace conflicts between attempted installs of lib32-libcairo-perf-utils-1.14.12-r0.x86 and libcairo-perf-utils-1.14.12-r0.core2_64
| file /usr/bin/icu-config conflicts between attempted installs of lib32-icu-dev-62.1-r0.x86 and icu-dev-62.1-r0.core2_64
| file /usr/bin/gpgrt-config conflicts between attempted installs of lib32-libgpg-error-dev-1.32-r0.x86 and libgpg-error-dev-1.32-r0.core2_64
(From OE-Core rev: 52f2dd97e9dd20dea0f3cdeb2df490d1a4c646aa)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/icu/icu.inc')
| -rw-r--r-- | meta/recipes-support/icu/icu.inc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-support/icu/icu.inc b/meta/recipes-support/icu/icu.inc index f0786baa03..e20085fbf5 100644 --- a/meta/recipes-support/icu/icu.inc +++ b/meta/recipes-support/icu/icu.inc | |||
| @@ -19,7 +19,9 @@ BINCONFIG = "${bindir}/icu-config" | |||
| 19 | 19 | ||
| 20 | ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}" | 20 | ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}" |
| 21 | 21 | ||
| 22 | inherit autotools pkgconfig binconfig | 22 | inherit autotools pkgconfig binconfig multilib_script |
| 23 | |||
| 24 | MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/icu-config" | ||
| 23 | 25 | ||
| 24 | # ICU needs the native build directory as an argument to its --with-cross-build option when | 26 | # ICU needs the native build directory as an argument to its --with-cross-build option when |
| 25 | # cross-compiling. Taken the situation that different builds may share a common sstate-cache | 27 | # cross-compiling. Taken the situation that different builds may share a common sstate-cache |