summaryrefslogtreecommitdiffstats
path: root/meta
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
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')
-rw-r--r--meta/recipes-graphics/cairo/cairo_1.14.12.bb6
-rw-r--r--meta/recipes-support/icu/icu.inc4
-rw-r--r--meta/recipes-support/libgpg-error/libgpg-error_1.32.bb5
3 files changed, 11 insertions, 4 deletions
diff --git a/meta/recipes-graphics/cairo/cairo_1.14.12.bb b/meta/recipes-graphics/cairo/cairo_1.14.12.bb
index a902c26879..18b947948a 100644
--- a/meta/recipes-graphics/cairo/cairo_1.14.12.bb
+++ b/meta/recipes-graphics/cairo/cairo_1.14.12.bb
@@ -30,7 +30,9 @@ SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz \
30SRC_URI[md5sum] = "9f0db9dbfca0966be8acd682e636d165" 30SRC_URI[md5sum] = "9f0db9dbfca0966be8acd682e636d165"
31SRC_URI[sha256sum] = "8c90f00c500b2299c0a323dd9beead2a00353752b2092ead558139bd67f7bf16" 31SRC_URI[sha256sum] = "8c90f00c500b2299c0a323dd9beead2a00353752b2092ead558139bd67f7bf16"
32 32
33inherit autotools pkgconfig upstream-version-is-even gtk-doc 33inherit autotools pkgconfig upstream-version-is-even gtk-doc multilib_script
34
35MULTILIB_SCRIPTS = "${PN}-perf-utils:${bindir}/cairo-trace"
34 36
35X11DEPENDS = "virtual/libx11 libsm libxrender libxext" 37X11DEPENDS = "virtual/libx11 libsm libxrender libxext"
36 38
@@ -79,7 +81,7 @@ DESCRIPTION_cairo-perf-utils = "The Cairo library performance utilities"
79FILES_${PN} = "${libdir}/libcairo.so.*" 81FILES_${PN} = "${libdir}/libcairo.so.*"
80FILES_${PN}-gobject = "${libdir}/libcairo-gobject.so.*" 82FILES_${PN}-gobject = "${libdir}/libcairo-gobject.so.*"
81FILES_${PN}-script-interpreter = "${libdir}/libcairo-script-interpreter.so.*" 83FILES_${PN}-script-interpreter = "${libdir}/libcairo-script-interpreter.so.*"
82FILES_${PN}-perf-utils = "${bindir}/cairo-trace ${libdir}/cairo/*.la ${libdir}/cairo/libcairo-trace.so.*" 84FILES_${PN}-perf-utils = "${bindir}/cairo-trace* ${libdir}/cairo/*.la ${libdir}/cairo/libcairo-trace.so.*"
83FILES_${PN}-dev += "${libdir}/cairo/*.so" 85FILES_${PN}-dev += "${libdir}/cairo/*.so"
84 86
85BBCLASSEXTEND = "native" 87BBCLASSEXTEND = "native"
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
20ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}" 20ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}"
21 21
22inherit autotools pkgconfig binconfig 22inherit autotools pkgconfig binconfig multilib_script
23
24MULTILIB_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
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