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-13 07:42:28 +0100
commitd577afd930d2eec46db6805314b8bab7b700841a (patch)
tree75006f412cb29bd6dbd3b512ca9d9252787292fc /meta/recipes-support/libgpg-error
parent1d5b01c956918fe3dec90649fc9d83c38f3afa50 (diff)
downloadpoky-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/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
20 20
21BINCONFIG = "${bindir}/gpg-error-config" 21BINCONFIG = "${bindir}/gpg-error-config"
22 22
23inherit autotools binconfig-disabled pkgconfig gettext multilib_header 23inherit autotools binconfig-disabled pkgconfig gettext multilib_header multilib_script
24
25MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/gpgrt-config"
26
24CPPFLAGS += "-P" 27CPPFLAGS += "-P"
25do_compile_prepend() { 28do_compile_prepend() {
26 TARGET_FILE=linux-gnu 29 TARGET_FILE=linux-gnu