diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-17 10:22:43 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-18 10:33:13 +0000 |
| commit | 4972d5dbd94a5a1fe9848e20730245f0f715501f (patch) | |
| tree | 4b0feb7ef2aee9c4a362ff5a1424209c054cd488 | |
| parent | 18880a9f1cbc94b8c963f636e9756a1020fc5575 (diff) | |
| download | poky-4972d5dbd94a5a1fe9848e20730245f0f715501f.tar.gz | |
glib-2.0: Improve shared-mime-info dependency handling
This cleans up the handling of the dependency and gets rid of a use of
remove which should never be needed in OE-Core.
(From OE-Core rev: 93c6e5023d74bf6fae8e3a70afd9dca6b1ab555a)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/glib-2.0/glib.inc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index 7e2847d4b2..a186c1d9eb 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc | |||
| @@ -77,10 +77,12 @@ FILES_${PN}-codegen = "${datadir}/glib-2.0/codegen/*.py \ | |||
| 77 | ${bindir}/gdbus-codegen" | 77 | ${bindir}/gdbus-codegen" |
| 78 | FILES_${PN}-utils = "${bindir}/*" | 78 | FILES_${PN}-utils = "${bindir}/*" |
| 79 | 79 | ||
| 80 | RRECOMMENDS_${PN} += "shared-mime-info" | 80 | SHAREDMIMEDEP = "shared-mime-info" |
| 81 | SHAREDMIMEDEP_class-native = "" | ||
| 81 | # When cross compiling for Windows we don't want to include this | 82 | # When cross compiling for Windows we don't want to include this |
| 82 | RRECOMMENDS_${PN}_remove_mingw32 = "shared-mime-info" | 83 | SHAREDMIMEDEP_mingw32 = "" |
| 83 | RRECOMMENDS_${PN}_class-native = "" | 84 | |
| 85 | RRECOMMENDS_${PN} += "${SHAREDMIMEDEP}" | ||
| 84 | 86 | ||
| 85 | ARM_INSTRUCTION_SET_armv4 = "arm" | 87 | ARM_INSTRUCTION_SET_armv4 = "arm" |
| 86 | ARM_INSTRUCTION_SET_armv5 = "arm" | 88 | ARM_INSTRUCTION_SET_armv5 = "arm" |