summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/meson/meson.inc
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2019-11-05 23:08:31 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-11-18 14:42:12 +0000
commit8855a1ec4de0762038590ff06355af7ba8beea29 (patch)
treeede54e4fa0c8da439ef13dae846a02c8d1775c3d /meta/recipes-devtools/meson/meson.inc
parent40ca39df1b8de8ca476c9085442dbc58fb57abb3 (diff)
downloadpoky-8855a1ec4de0762038590ff06355af7ba8beea29.tar.gz
meson: Backport patch to handle strings in cross file args
This allows <language>_args and <language>_link_args properties, e.g., c_link_args, in meson.cross to be specified as either a string or a list. (From OE-Core rev: 1913e688ad95d465e9b9d16ad57f2bdef2b50d93) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Armin Kuster <akuster808@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.inc1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc
index bfe9851e94..ef26848498 100644
--- a/meta/recipes-devtools/meson/meson.inc
+++ b/meta/recipes-devtools/meson/meson.inc
@@ -17,6 +17,7 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
17 file://many-cross.patch \ 17 file://many-cross.patch \
18 file://cross-libdir.patch \ 18 file://cross-libdir.patch \
19 file://0001-Fix-missing-return-statements-that-are-seen-with-Wer.patch \ 19 file://0001-Fix-missing-return-statements-that-are-seen-with-Wer.patch \
20 file://0001-Handle-strings-in-cross-file-args.-Closes-4671.patch \
20 " 21 "
21SRC_URI[sha256sum] = "ef9f14326ec1e30d3ba1a26df0f92826ede5a79255ad723af78a2691c37109fd" 22SRC_URI[sha256sum] = "ef9f14326ec1e30d3ba1a26df0f92826ede5a79255ad723af78a2691c37109fd"
22SRC_URI[md5sum] = "0267b0871266056184c484792572c682" 23SRC_URI[md5sum] = "0267b0871266056184c484792572c682"