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-12 08:17:37 +0100 |
commit | 52f2dd97e9dd20dea0f3cdeb2df490d1a4c646aa (patch) | |
tree | 9f84e0a66a5454b0216ab7902696eddeca0080ee /meta/recipes-support/icu/icu.inc | |
parent | 3197c086269a4b21fb807a9c552b56f23c5b86dc (diff) | |
download | openembedded-core-contrib-52f2dd97e9dd20dea0f3cdeb2df490d1a4c646aa.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
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" ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}" -inherit autotools pkgconfig binconfig +inherit autotools pkgconfig binconfig multilib_script + +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/icu-config" # ICU needs the native build directory as an argument to its --with-cross-build option when # cross-compiling. Taken the situation that different builds may share a common sstate-cache |