diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2018-11-28 00:01:07 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-01-08 20:14:42 +0000 |
commit | f48d96e4dfaf917dc99f8aa8830845e1e13794b7 (patch) | |
tree | 94d1b5cbcb231a57eabab368b997dd8bb0a1201a /meta/recipes-devtools | |
parent | b55b254f4ed4231e173dfbf27ab0c594104db827 (diff) | |
download | poky-f48d96e4dfaf917dc99f8aa8830845e1e13794b7.tar.gz |
meson: Correct use of the _append operator
The value to SRC_URI_append_class-native was not prefixed with a space.
This was not noticed as the SRC_URI before applying the _append contains
trailing spaces. However, if one, e.g., has a .bbappend and adds to the
SRC_URI using SRC_URI += "file://foo.patch", then there no longer is any
trailing space and the _append concatenates the two URIs together,
leading to a build failue.
(From OE-Core rev: c07ee11e99dfe28405a7225903a541b33aeb1de6)
(From OE-Core rev: 53594c9fd01f7bd02e24aa82a5bd3a14d3dd465e)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/meson/meson.inc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc index f878695903..61b2391484 100644 --- a/meta/recipes-devtools/meson/meson.inc +++ b/meta/recipes-devtools/meson/meson.inc | |||
@@ -17,9 +17,10 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P | |||
17 | SRC_URI[sha256sum] = "92d8afd921751261e36151643464efd3394162f69efbe8cd53e0a66b1cf395eb" | 17 | SRC_URI[sha256sum] = "92d8afd921751261e36151643464efd3394162f69efbe8cd53e0a66b1cf395eb" |
18 | SRC_URI[md5sum] = "31bda3519d8c0eb3438267268a78085e" | 18 | SRC_URI[md5sum] = "31bda3519d8c0eb3438267268a78085e" |
19 | 19 | ||
20 | SRC_URI_append_class-native = "file://0002-Make-CPU-family-warnings-fatal.patch \ | 20 | SRC_URI_append_class-native = " \ |
21 | file://0001-Support-building-allarch-recipes-again.patch \ | 21 | file://0002-Make-CPU-family-warnings-fatal.patch \ |
22 | " | 22 | file://0001-Support-building-allarch-recipes-again.patch \ |
23 | " | ||
23 | 24 | ||
24 | UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases" | 25 | UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases" |
25 | 26 | ||