From 52f2dd97e9dd20dea0f3cdeb2df490d1a4c646aa Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Tue, 11 Sep 2018 19:25:23 -0400 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-support/icu/icu.inc | 4 +++- meta/recipes-support/libgpg-error/libgpg-error_1.32.bb | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'meta/recipes-support') 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 diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.32.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.32.bb index 098242ea10..a4c720be9d 100644 --- a/meta/recipes-support/libgpg-error/libgpg-error_1.32.bb +++ b/meta/recipes-support/libgpg-error/libgpg-error_1.32.bb @@ -20,7 +20,10 @@ SRC_URI[sha256sum] = "c345c5e73cc2332f8d50db84a2280abfb1d8f6d4f1858b9daa30404db4 BINCONFIG = "${bindir}/gpg-error-config" -inherit autotools binconfig-disabled pkgconfig gettext multilib_header +inherit autotools binconfig-disabled pkgconfig gettext multilib_header multilib_script + +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/gpgrt-config" + CPPFLAGS += "-P" do_compile_prepend() { TARGET_FILE=linux-gnu -- cgit 1.2.3-korg