diff options
| author | Jeremy Puhlman <jpuhlman@mvista.com> | 2020-03-11 15:22:49 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-03-12 22:49:28 +0000 |
| commit | df97528d1918eeae2547c438f5372eb9c72cfd0f (patch) | |
| tree | 87ddbf9ffca76f2f3587aa4ebe9e6dd7a9b9c191 /meta | |
| parent | 3fbc48a1d838ce1f0ffc7d8fbc4e34e9f847fe01 (diff) | |
| download | poky-df97528d1918eeae2547c438f5372eb9c72cfd0f.tar.gz | |
glib-2.0: Correct multilib conflict
(From OE-Core rev: c82076d68bc95b6f9e3f125bba44b4dbaee444bf)
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 | 3 |
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 () { | |||
| 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 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 | fi | ||
| 131 | } | 134 | } |
| 132 | 135 | ||
| 133 | # As we do not build python3 for windows, makes no sense to ship the script that's using it | 136 | # As we do not build python3 for windows, makes no sense to ship the script that's using it |