glib-2.0: Correct multilib conflict

Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 23c347dbf76a64cd74979a9ee194f29e510d5b27..edecc51fdb8358b5694e2f80e411f6764190ce3f 100644 (file)
--- 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