summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorZhixiong Chi <zhixiong.chi@windriver.com>2018-08-13 00:04:24 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-14 11:36:31 +0100
commit70eb6be9b1c30d687c3f67a020680dcfab356f49 (patch)
treee33d1e6fb107daaf12e1fb8073caaa49a6328b6c /meta
parent4e479cee5d87155e2a90801496033f1a03c5ab30 (diff)
downloadpoky-70eb6be9b1c30d687c3f67a020680dcfab356f49.tar.gz
nspr: fix script conflict for multilib
Stop the nspr-config scripts conflicting in a multilib case. (From OE-Core rev: b13fa9bf966bb6f132e82b94bf1ecf4b2e095dbe) Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/nspr/nspr_4.19.bb4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-support/nspr/nspr_4.19.bb b/meta/recipes-support/nspr/nspr_4.19.bb
index b43c78081d..b5264be2a0 100644
--- a/meta/recipes-support/nspr/nspr_4.19.bb
+++ b/meta/recipes-support/nspr/nspr_4.19.bb
@@ -149,7 +149,9 @@ TESTS = " \
149 xnotify \ 149 xnotify \
150 zerolen" 150 zerolen"
151 151
152inherit autotools 152inherit autotools multilib_script
153
154MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/nspr-config"
153 155
154PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" 156PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
155PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," 157PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"