diff options
author | Jeremy Puhlman <jpuhlman@mvista.com> | 2020-03-16 23:03:05 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-03-24 16:39:40 +0000 |
commit | 3fa3ce2ae07339f2b2bd4b1136b9b776d76e62f6 (patch) | |
tree | 5272c3071b5eb75ad798e6a9c7e76f54e2eb0f1e /meta | |
parent | 719c14c984adb85ae0d3b91a6cb8c181a7bb1a4d (diff) | |
download | poky-3fa3ce2ae07339f2b2bd4b1136b9b776d76e62f6.tar.gz |
glib-2.0: update ptest multilib fix
The updates to the tests are done in do_install instead of do_install_ptest,
so the changes need to consider ptest not being turned on.
(From OE-Core rev: 6baaf3a530d5e4d6015c1dc53a2849a20bafafe4)
Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib.inc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index edecc51fdb..7ebed0e5fd 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc | |||
@@ -128,9 +128,11 @@ do_install_append_class-target () { | |||
128 | rm ${D}${datadir}/installed-tests/glib/gdbus-serialization.test | 128 | rm ${D}${datadir}/installed-tests/glib/gdbus-serialization.test |
129 | fi | 129 | fi |
130 | fi | 130 | fi |
131 | if [ -f ${D}${datadir}/installed-tests/glib/static-link.test ]; then | ||
131 | if test "x${MLPREFIX}" != "x"; then | 132 | if test "x${MLPREFIX}" != "x"; then |
132 | mv ${D}${datadir}/installed-tests/glib/static-link.test ${D}${datadir}/installed-tests/glib/${MLPREFIX}static-link.test | 133 | mv ${D}${datadir}/installed-tests/glib/static-link.test ${D}${datadir}/installed-tests/glib/${MLPREFIX}static-link.test |
133 | fi | 134 | fi |
135 | fi | ||
134 | } | 136 | } |
135 | 137 | ||
136 | # As we do not build python3 for windows, makes no sense to ship the script that's using it | 138 | # As we do not build python3 for windows, makes no sense to ship the script that's using it |