[oe-commits] [openembedded-core] 02/13: glib-2.0: Correct multilib conflict
git at git.openembedded.org
git at git.openembedded.org
Thu Mar 12 00:28:23 UTC 2020
This is an automated email from the git hooks/post-receive script.
rpurdie pushed a commit to branch master-next
in repository openembedded-core.
commit 58449eca0777aca564583e60f9bc0e23ecc3a764
Author: Jeremy Puhlman <jpuhlman at mvista.com>
AuthorDate: Wed Mar 11 15:22:49 2020 -0700
glib-2.0: Correct multilib conflict
Signed-off-by: Jeremy A. Puhlman <jpuhlman at mvista.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
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 23c347d..edecc51 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
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list