From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id F17B6A32A2
for <public@inbox.dpdk.org>; Thu, 24 Oct 2019 14:17:23 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id B3CF71E8DA;
Thu, 24 Oct 2019 14:17:23 +0200 (CEST)
Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com
[209.85.128.67]) by dpdk.org (Postfix) with ESMTP id 66C021DFE7
for <dev@dpdk.org>; Thu, 24 Oct 2019 14:17:22 +0200 (CEST)
Received: by mail-wm1-f67.google.com with SMTP id 3so2375328wmi.3
for <dev@dpdk.org>; Thu, 24 Oct 2019 05:17:22 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to
:references:content-transfer-encoding:user-agent:mime-version;
bh=+giW+l6aQ6ycjwRB+ZgdPpV0eQ6dNfJtWM+y/MCdY34=;
b=XAEKK5/fkzWy2gwqreYo3S1CWZR2dNhiLMNjb+hY0AZp3hJ60glxOueXQwAxG5cCcQ
Rd0AgKdGp+P//iqjFqbEogiwpW1BXqeF6TPYAyzWZi3gFjT1vEB7sXPMrGgp9l/yuzMv
d9xUl8DU1qsNiqPD+x+S6TxuEPjP0421zbfJ39S9jQD9OHNbvzXsMU5K6wZI30GTVHwP
YlUCCFFOM/TM8YcWiszvZkaNA6T9JVQhFsp+jcq7V82dRBNM6W6Kz7y/Y9CQq5phdvA9
UNZRMNS2GTdEKeKyoXbUXngviND0itiks6LeCybOoFxL9/uVf2yEosuSdCHSUHW31nen
kxig==
X-Gm-Message-State: APjAAAXs0Li/MhBmqfKMzzBFLv+qYmvy82u37vBUWNBtIBarLKzpwB0j
G4hGtDMTxxWOvd+rqNbC/TnRM3To
X-Google-Smtp-Source: APXvYqxKPBUW5MQLMWB/a5DcPULeeTjhpuJLn1UnvkmHjqSpXi+l5EG2p429MHW0dIyRneFb6lQ/2g==
X-Received: by 2002:a1c:9cc6:: with SMTP id f189mr5061177wme.80.1571919441936;
Thu, 24 Oct 2019 05:17:21 -0700 (PDT)
Received: from localhost ([88.98.246.218])
by smtp.gmail.com with ESMTPSA id z9sm24721983wrv.1.2019.10.24.05.17.21
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 24 Oct 2019 05:17:21 -0700 (PDT)
Message-ID: <11fc9738f6856ffc4087b91c0be0a2fda4958cc0.camel@debian.org>
From: Luca Boccassi <bluca@debian.org>
To: Bruce Richardson <bruce.richardson@intel.com>, thomas@monjalon.net
Cc: dev@dpdk.org
Date: Thu, 24 Oct 2019 13:17:20 +0100
In-Reply-To: <20191024104108.2331-1-bruce.richardson@intel.com>
References: <20191024104108.2331-1-bruce.richardson@intel.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.30.5-1.1
MIME-Version: 1.0
Subject: Re: [dpdk-dev] [PATCH] build: fix compatibility with meson 0.47
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
On Thu, 2019-10-24 at 11:41 +0100, Bruce Richardson wrote:
> The "in" keyword was introduced in meson 0.49, which means we need to
> use
> an old-fashioned loop to check the array of disabled drivers.
>=20
> Fixes: 6f80f1cd2247 ("build: support disabling drivers with meson")
>=20
> Signed-off-by: Bruce Richardson <
> bruce.richardson@intel.com
> >
> ---
> drivers/meson.build | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
>=20
> diff --git a/drivers/meson.build b/drivers/meson.build
> index 4a1cb8b5b..156d2dc71 100644
> --- a/drivers/meson.build
> +++ b/drivers/meson.build
> @@ -61,10 +61,15 @@ foreach class:dpdk_driver_classes
> # pull in driver directory which should assign to each
> of the above
> subdir(drv_path)
> =20
> - if drv_path in disabled_drivers
> - build =3D false
> - reason =3D 'Explicitly disabled via build config'
> - elif build
> + # skip disabled drivers. For meson 0.49 change this to
> use
> + # "in" keyword
> + foreach disable_path: disabled_drivers
> + if drv_path =3D=3D disable_path
> + build =3D false
> + reason =3D 'Explicitly disabled via build
> config'
> + endif
> + endforeach
> + if build
> # get dependency objs from strings
> shared_deps =3D ext_deps
> static_deps =3D ext_deps
>=20
Acked-by: Luca Boccassi <bluca@debian.org>
--=20
Kind regards,
Luca Boccassi