[OE-core] 回复: [PATCH 2/2] glib-2.0: Correct multilib conflict

[Chen, Qi]

This patch is causing regression in case of qemuarm64 multilib for me. The static-link.test file is not there, resulting the `mv' command failure. I've sent out a patch to fix this problem, but I don't know what's your environment. So please help review.

Regards,
Chen Qi
________________________________
发件人: openembedded-core-bounces at lists.openembedded.org <openembedded-core-bounces at lists.openembedded.org> 代表 Jeremy A. Puhlman <jpuhlman at mvista.com>
发送时间: 2020年3月12日 6:22
收件人: openembedded-core at lists.openembedded.org <openembedded-core at lists.openembedded.org>
主题: [OE-core] [PATCH 2/2] glib-2.0: Correct multilib conflict

From: Jeremy Puhlman <jpuhlman at mvista.com>

Signed-off-by: Jeremy A. Puhlman <jpuhlman at mvista.com>
---
 meta/recipes-core/glib-2.0/glib.inc | 3 +++
 1 file changed, 3 insertions(+)

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
--
2.13.3

--
_______________________________________________
Openembedded-core mailing list
Openembedded-core at lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20200317/e7e46654/attachment-0001.html>