diff options
author | Ross Burton <ross.burton@intel.com> | 2018-09-25 14:43:44 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-25 23:15:49 +0100 |
commit | ff33ab40aff7ac3720dbe214fed413052388eec9 (patch) | |
tree | 3b87d21085d3ddfdef14d1619dfc0a686ac3ef41 /meta/recipes-devtools/meson/meson.inc | |
parent | e6704327568993170ae3be5880cbbc191fa1af99 (diff) | |
download | poky-ff33ab40aff7ac3720dbe214fed413052388eec9.tar.gz |
meson: squash the architecture warning patches together
Instead of one patch to change a warning into an exception and another to change
the message, squash the patches together as neither of the are acceptable
upstream.
(From OE-Core rev: d9e5308ebfe376814f383d61ed00b50e8bad526b)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/meson/meson.inc')
-rw-r--r-- | meta/recipes-devtools/meson/meson.inc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc index e7f999a205..cfb831b106 100644 --- a/meta/recipes-devtools/meson/meson.inc +++ b/meta/recipes-devtools/meson/meson.inc | |||
@@ -10,7 +10,6 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P | |||
10 | file://0001-Linker-rules-move-cross_args-in-front-of-output_args.patch \ | 10 | file://0001-Linker-rules-move-cross_args-in-front-of-output_args.patch \ |
11 | file://0003-native_bindir.patch \ | 11 | file://0003-native_bindir.patch \ |
12 | file://0002-Make-CPU-family-warnings-fatal.patch \ | 12 | file://0002-Make-CPU-family-warnings-fatal.patch \ |
13 | file://0003-Send-user-to-our-wiki-instead-of-Meson-bug-system.patch \ | ||
14 | file://0001-Support-building-allarch-recipes-again.patch \ | 13 | file://0001-Support-building-allarch-recipes-again.patch \ |
15 | " | 14 | " |
16 | SRC_URI[sha256sum] = "92d8afd921751261e36151643464efd3394162f69efbe8cd53e0a66b1cf395eb" | 15 | SRC_URI[sha256sum] = "92d8afd921751261e36151643464efd3394162f69efbe8cd53e0a66b1cf395eb" |