From: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
To: openembedded-core@lists.openembedded.org
Subject: [thud][PATCH 2/2] meson: Correct use of the _append operator
Date: Sat, 22 Dec 2018 23:13:22 +0100 [thread overview]
Message-ID: <20181222221322.3768-2-pkj@axis.com> (raw)
In-Reply-To: <20181222221322.3768-1-pkj@axis.com>
From: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
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.
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
This is a backport from master.
meta/recipes-devtools/meson/meson.inc | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc
index b7fb3e698a..40b29d5802 100644
--- a/meta/recipes-devtools/meson/meson.inc
+++ b/meta/recipes-devtools/meson/meson.inc
@@ -15,9 +15,10 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
SRC_URI[sha256sum] = "92d8afd921751261e36151643464efd3394162f69efbe8cd53e0a66b1cf395eb"
SRC_URI[md5sum] = "31bda3519d8c0eb3438267268a78085e"
-SRC_URI_append_class-native = "file://0002-Make-CPU-family-warnings-fatal.patch \
- file://0001-Support-building-allarch-recipes-again.patch \
- "
+SRC_URI_append_class-native = " \
+ file://0002-Make-CPU-family-warnings-fatal.patch \
+ file://0001-Support-building-allarch-recipes-again.patch \
+"
UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases"
--
2.12.0
next prev parent reply other threads:[~2018-12-22 22:13 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-22 22:13 [thud][PATCH 1/2] libaio: Extend to native Peter Kjellerstedt
2018-12-22 22:13 ` Peter Kjellerstedt [this message]
2018-12-23 16:48 ` [thud][PATCH 2/2] meson: Correct use of the _append operator akuster808
2019-02-22 11:00 ` [thud][PATCH 1/2] libaio: Extend to native Peter Kjellerstedt
2019-02-22 15:20 ` akuster808
2019-02-25 11:38 ` Peter Kjellerstedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181222221322.3768-2-pkj@axis.com \
--to=peter.kjellerstedt@axis.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox