summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libgpg-error
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2018-09-11 19:25:23 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-12 08:17:37 +0100
commit52f2dd97e9dd20dea0f3cdeb2df490d1a4c646aa (patch)
tree9f84e0a66a5454b0216ab7902696eddeca0080ee /meta/recipes-support/libgpg-error
parent3197c086269a4b21fb807a9c552b56f23c5b86dc (diff)
downloadopenembedded-core-52f2dd97e9dd20dea0f3cdeb2df490d1a4c646aa.tar.gz
openembedded-core-52f2dd97e9dd20dea0f3cdeb2df490d1a4c646aa.tar.bz2
openembedded-core-52f2dd97e9dd20dea0f3cdeb2df490d1a4c646aa.zip
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/libgpg-error')
-rw-r--r--meta/recipes-support/libgpg-error/libgpg-error_1.32.bb5
1 files changed, 4 insertions, 1 deletions
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