diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-04-15 12:54:49 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-04-16 11:10:02 +0100 |
commit | c46c419929910e28de9b1d56993b3958bee35457 (patch) | |
tree | f6ef445ddf39303fc813592a354e2bb45e371ca6 /meta/recipes-devtools/meson/meson.inc | |
parent | 8a9aaf9e1e311e7172d5551e380481aee4be1bd3 (diff) | |
download | poky-c46c419929910e28de9b1d56993b3958bee35457.tar.gz |
meson: update to 0.50.0
Remove 0001-Linker-rules-move-cross_args-in-front-of-output_args.patch
as the upstream code has been completely reworked; if the issues pops up
again, we need to re-write the fix.
Rebase:
0001-Make-CPU-family-warnings-fatal.patch
0001-environment.py-detect-windows-also-if-the-system-str.patch
0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch
0002-Support-building-allarch-recipes-again.patch
Add 0001-mesonbuild-environment.py-check-environment-for-vari.patch
as particularly we set windows resource compiler through an
environment variable WINDRES. This has replaced the
0001-modules-windows-split-WINDRES-env-variable.patch as the code
has been refactored.
Add 0001-mesonbuild-environment.py-do-not-determine-whether-a.patch
for a more robust detection of cross builds.
Replace many-cross.patch with corresponding backports from upcoming 0.50.1:
0007-mesonbuild-allow-multiple-cross-file-options.patch
load-configs-generalise-search-path.patch
Drop cross-libdir.patch as it has been merged upstream.
(From OE-Core rev: 3f9a0f0c6c99364eb128ffc2db704e957f1c0bce)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.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 | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc index 2d18f72c0c..6d743fbe14 100644 --- a/meta/recipes-devtools/meson/meson.inc +++ b/meta/recipes-devtools/meson/meson.inc | |||
@@ -7,18 +7,18 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" | |||
7 | SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${PV}.tar.gz \ | 7 | SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${PV}.tar.gz \ |
8 | file://0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch \ | 8 | file://0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch \ |
9 | file://0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch \ | 9 | file://0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch \ |
10 | file://0001-Linker-rules-move-cross_args-in-front-of-output_args.patch \ | ||
11 | file://0003-native_bindir.patch \ | 10 | file://0003-native_bindir.patch \ |
12 | file://0001-python-module-do-not-manipulate-the-environment-when.patch \ | 11 | file://0001-python-module-do-not-manipulate-the-environment-when.patch \ |
13 | file://disable-rpath-handling.patch \ | 12 | file://disable-rpath-handling.patch \ |
14 | file://0001-modules-windows-split-WINDRES-env-variable.patch \ | ||
15 | file://0002-environment.py-detect-windows-also-if-the-system-str.patch \ | ||
16 | file://cross-prop-default.patch \ | 13 | file://cross-prop-default.patch \ |
17 | file://many-cross.patch \ | 14 | file://load-configs-generalise-search-path.patch \ |
18 | file://cross-libdir.patch \ | 15 | file://0007-mesonbuild-allow-multiple-cross-file-options.patch \ |
16 | file://0001-environment.py-detect-windows-also-if-the-system-str.patch \ | ||
17 | file://0001-mesonbuild-environment.py-do-not-determine-whether-a.patch \ | ||
18 | file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \ | ||
19 | " | 19 | " |
20 | SRC_URI[sha256sum] = "ef9f14326ec1e30d3ba1a26df0f92826ede5a79255ad723af78a2691c37109fd" | 20 | SRC_URI[sha256sum] = "2a1bc42dda58206fb922cda5e1ca95cc03ad126321d26acc47d3493ec4e7021f" |
21 | SRC_URI[md5sum] = "0267b0871266056184c484792572c682" | 21 | SRC_URI[md5sum] = "433483107fda4616eaf33de7e7083a84" |
22 | 22 | ||
23 | SRC_URI_append_class-native = " \ | 23 | SRC_URI_append_class-native = " \ |
24 | file://0001-Make-CPU-family-warnings-fatal.patch \ | 24 | file://0001-Make-CPU-family-warnings-fatal.patch \ |