From patchwork Wed Jun 13 11:50:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 138442 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp642782lji; Wed, 13 Jun 2018 05:15:49 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIgkJcn37zFM3UH8EpjHfm/opM09RelQAjdgKpcSwUibmquMyNbFo2y36u/eRaJ85mEJlrB X-Received: by 2002:a65:5284:: with SMTP id y4-v6mr3806700pgp.297.1528892148904; Wed, 13 Jun 2018 05:15:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528892148; cv=none; d=google.com; s=arc-20160816; b=S0Xl7Ef1h42PCp0i3fR4UrFq+3HY3+aDS1JVxm7brd0MdhoZCLpmyUyrD+SoQTnE1/ TVqyK7zCkNExnZf7FekA7V3dRBG/bDZdBZxNMwauxDVMxumym3YmMGO/q/VzlKVxQx8t Uk3thqzgF4GV2SlQ+Q4PoQqElPrzynSDeWyv3qQf0P2q5g/OIV19auyt8mM5aSwG477m jV8mav2yx416Gz8wkUjPj3484pkKA8A2Z67u1pWVFHN/RuIsZRhzJqO1+l1YVseOdUwP bs9VU1+/8QEFm0DZsPD9zX8+63FtTQPUjju5o12o0QEVoWm5mOjUexJuBK1R0eH7Dlvw jMVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=jdDW++5Ee9dE2t5jLN7aVnQTA6wD6tM9du4LESaeFto=; b=PeYtjSfLBf7XeiS+4zMoKVKgYgBGDt80nvFLBh/496+S7hYBGAHbV5/p5ATjd9udAw nrrWokiCQ85OhBB3HgCnfdM1h/4tTkpPIrnx5QgR0GIQgL1lBRuMXbaSUKwwkCIgF9TT dlnsqJKM1QX2zsl1bKGeFI2pbPXh1/HjWYHUc7YBofClgJKJERdDnkRdbTfBwNoaDFC1 0FnNMihpgu+57D3HJjZ13mD85OTpYK76RMxKnRUMI/ecWnZps5RRBh1GzHaqF2BvxRPg 4wYvhZLFADzDA3NZRNKU8d3c5NCB1bJgrNP+eVKDGkDqpSce/v5Yo7zXn9OJuocC/FDJ hf1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=xZeLPrvU; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id y9-v6si2214860pgo.570.2018.06.13.05.15.48; Wed, 13 Jun 2018 05:15:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=xZeLPrvU; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id A41A179067; Wed, 13 Jun 2018 12:15:43 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr0-f175.google.com (mail-wr0-f175.google.com [209.85.128.175]) by mail.openembedded.org (Postfix) with ESMTP id E640C79069 for ; Wed, 13 Jun 2018 11:50:49 +0000 (UTC) Received: by mail-wr0-f175.google.com with SMTP id e18-v6so2438175wrs.5 for ; Wed, 13 Jun 2018 04:50:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=BEh9Ohx7A87BCDci8gX/n1MyEnj6jJFAe1kpQuXhHPU=; b=xZeLPrvUoW+S/znbQZxu2azR73c6t2SVvXaJ4tIenL7OQuwXri+hwWrFaOYkZhBiLL 57svQWDdrnE5/kwfUgvVcbd6K8xomwwp0yS0Cewf8qK0eYRc7b7FyKpDhg5oHr1Xm1iB 25FvFmkwkEPswuHllbklNIZG7yWGDtZd+ClOcx9S9vyyeaTVkpt+Wz20+nTPH9vrBUxB SwedFm1Y5rZ5XSOfN2o56j2rTh5MS9M7rNQO01HwgmNPw1Q/dr3wzPybdojviyZlzj/0 8k7CnrOaER1UTZa9koOjhDAcDMq0c1pY9QI+uoMBYC/jyk8msyWKyUsBxp/T5Kk5idqD KQPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=BEh9Ohx7A87BCDci8gX/n1MyEnj6jJFAe1kpQuXhHPU=; b=Q3lF6OLGeXa/erZBKE9ixfFLvG0agMglK6lQLawQieQIT5da1WJo913pT/alN/rW8y Tfb9IRwb+RO7EST7IRiGB+S4M7UwIHfpl3aMGYGXvga5jMLP/maNR3BoTyJNvL6ZD2Er uWcong0k5JAQAO06vchPsWc2oc+W4sUrB2Z0SupsalJ+UWXKl3wlMj6xS7jLxPa8kmr4 LdDBFSO7JEcq/zMqNoit8AH8f0PvZi6H850xXDxnBSp2cErP7KnWGxF6g5EALxwc65Cb DUR15AKcsU6HvMpKP0fb4TDUCS/t38nSIJ4y6Auwh+xBqExWQ1fin62XnC2tPEdVsv+7 wSLg== X-Gm-Message-State: APt69E1Our3f7JUAqnvN3snE1AYisUYfOWq1P9lbrjMDV8Z0EHiiXyFo hj0DSfSSWrj4REGLMJgC/qWA61eG X-Received: by 2002:a5d:4843:: with SMTP id n3-v6mr3795584wrs.24.1528890650197; Wed, 13 Jun 2018 04:50:50 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id h11-v6sm2214105wrs.85.2018.06.13.04.50.48 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Jun 2018 04:50:49 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Wed, 13 Jun 2018 12:50:45 +0100 Message-Id: <20180613115045.28339-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH] meson: only use lists of commands in cross file if required 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: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org There's a bug in Meson[1] where it find_program("foo") will fail if foo is defined in the cross file as a list. This is causing the Meson build of libdrm to fail, but for this instance we can work around the problem by only using lists in the cross file if there are arguments, and just using a string if there are not. [1] https://github.com/mesonbuild/meson/issues/3737 Signed-off-by: Ross Burton --- meta/classes/meson.bbclass | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass index 5881765abba..e572344bd20 100644 --- a/meta/classes/meson.bbclass +++ b/meta/classes/meson.bbclass @@ -42,7 +42,8 @@ MESON_CROSS_FILE_class-target = "--cross-file ${WORKDIR}/meson.cross" MESON_CROSS_FILE_class-nativesdk = "--cross-file ${WORKDIR}/meson.cross" def meson_array(var, d): - return "', '".join(d.getVar(var).split()).join(("'", "'")) + items = d.getVar(var).split() + return repr(items[0] if len(items) == 1 else items) addtask write_config before do_configure do_write_config[vardeps] += "MESON_C_ARGS MESON_CPP_ARGS MESON_LINK_ARGS CC CXX LD AR NM STRIP READELF" @@ -50,21 +51,21 @@ do_write_config() { # This needs to be Py to split the args into single-element lists cat >${WORKDIR}/meson.cross <