diff options
| author | Alistair Francis <alistair.francis@xilinx.com> | 2017-09-25 15:56:55 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-10-07 23:20:39 +0100 |
| commit | 7ea2d2fb57572a03e322810c57e73b9255de9053 (patch) | |
| tree | d5f97aaa497543b02bd416fb6f22ac57323268df /meta | |
| parent | a2201f192aa79bf8ebde54d764307325a3f0f09c (diff) | |
| download | poky-7ea2d2fb57572a03e322810c57e73b9255de9053.tar.gz | |
glib-2.0: Remove recommend shared-mime-info for MinGW
Commit glib-2.0: recommend shared-mime-info
(51e4f9ca5368af5cefa26f4ca50b282e858982f8) broke compilation when cross
compiling for Windows. This patch removes the recommendation for
shared-mime-info when using MinGW cross compile.
(From OE-Core rev: cc9d855660db27e82d1b37ab5d1820c556827635)
Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Cc: Ross Burton <ross.burton@intel.com>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Ross Burton <ross.burton@intel.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 ce15ccefc3..8434b7dae3 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc | |||
| @@ -74,6 +74,8 @@ FILES_${PN}-codegen = "${datadir}/glib-2.0/codegen/*.py \ | |||
| 74 | FILES_${PN}-utils = "${bindir}/*" | 74 | FILES_${PN}-utils = "${bindir}/*" |
| 75 | 75 | ||
| 76 | RRECOMMENDS_${PN} += "shared-mime-info" | 76 | RRECOMMENDS_${PN} += "shared-mime-info" |
| 77 | # When cross compiling for Windows we don't want to include this | ||
| 78 | RRECOMMENDS_${PN}_remove_mingw32 = "shared-mime-info" | ||
| 77 | 79 | ||
| 78 | ARM_INSTRUCTION_SET_armv4 = "arm" | 80 | ARM_INSTRUCTION_SET_armv4 = "arm" |
| 79 | ARM_INSTRUCTION_SET_armv5 = "arm" | 81 | ARM_INSTRUCTION_SET_armv5 = "arm" |