Return-Path: Received: from bastet.se.axis.com (bastet.se.axis.com [195.60.68.11]) by mail.openembedded.org (Postfix) with ESMTP id 5AA616BF43 for ; Tue, 27 Nov 2018 23:01:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by bastet.se.axis.com (Postfix) with ESMTP id 430DD18533 for ; Wed, 28 Nov 2018 00:01:12 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at bastet.se.axis.com Received: from bastet.se.axis.com ([IPv6:::ffff:127.0.0.1]) by localhost (bastet.se.axis.com [::ffff:127.0.0.1]) (amavisd-new, port 10024) with LMTP id ACnNuStH7P6G for ; Wed, 28 Nov 2018 00:01:11 +0100 (CET) Received: from boulder02.se.axis.com (boulder02.se.axis.com [10.0.8.16]) by bastet.se.axis.com (Postfix) with ESMTPS id 53EB718532 for ; Wed, 28 Nov 2018 00:01:11 +0100 (CET) Received: from boulder02.se.axis.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2C8081A066 for ; Wed, 28 Nov 2018 00:01:11 +0100 (CET) Received: from boulder02.se.axis.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 218711A064 for ; Wed, 28 Nov 2018 00:01:11 +0100 (CET) Received: from thoth.se.axis.com (unknown [10.0.2.173]) by boulder02.se.axis.com (Postfix) with ESMTP for ; Wed, 28 Nov 2018 00:01:11 +0100 (CET) Received: from saur-2.se.axis.com (saur-2.se.axis.com [10.92.3.2]) by thoth.se.axis.com (Postfix) with ESMTP id 1656A1A7 for ; Wed, 28 Nov 2018 00:01:11 +0100 (CET) Received: from saur-2.se.axis.com (localhost [127.0.0.1]) by saur-2.se.axis.com (8.14.5/8.14.5) with ESMTP id wARN1Bb4025160 for ; Wed, 28 Nov 2018 00:01:11 +0100 Received: (from pkj@localhost) by saur-2.se.axis.com (8.14.5/8.14.5/Submit) id wARN1BMx025159 for openembedded-core@lists.openembedded.org; Wed, 28 Nov 2018 00:01:11 +0100 From: Peter Kjellerstedt To: openembedded-core@lists.openembedded.org Date: Wed, 28 Nov 2018 00:01:07 +0100 Message-Id: <20181127230107.25116-1-pkj@axis.com> X-Mailer: git-send-email 2.12.0 X-TM-AS-GCONF: 00 Subject: [PATCH] meson: Correct use of the _append operator X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Nov 2018 23:01:12 -0000 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 --- 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 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 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