summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorJeremy Puhlman <jpuhlman@mvista.com>2020-03-11 15:22:49 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-03-12 22:49:23 +0000
commitc82076d68bc95b6f9e3f125bba44b4dbaee444bf (patch)
tree26780ced3cecc21eddc0d7d3321af553f9fb8138 /meta/recipes-core
parent67d38c62b4a02a1ee1b6d751fa0f2483dafa2fb1 (diff)
downloadopenembedded-core-contrib-c82076d68bc95b6f9e3f125bba44b4dbaee444bf.tar.gz
glib-2.0: Correct multilib conflict
Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc3
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 23c347dbf7..edecc51fdb 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -128,6 +128,9 @@ do_install_append_class-target () {
rm ${D}${datadir}/installed-tests/glib/gdbus-serialization.test
fi
fi
+ if test "x${MLPREFIX}" != "x"; then
+ mv ${D}${datadir}/installed-tests/glib/static-link.test ${D}${datadir}/installed-tests/glib/${MLPREFIX}static-link.test
+ fi
}
# As we do not build python3 for windows, makes no sense to ship the script that's using it