[oe-commits] [openembedded-core] 02/03: meson: Correct use of the _append operator

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 25a916534653b7c05391b831099667d6983c10b2
Author: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
AuthorDate: Wed Nov 28 00:01:07 2018 +0100

    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.
    
    Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 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 f878695..61b2391 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
 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"
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.