From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9580CA32A2 for ; Thu, 24 Oct 2019 12:41:17 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0D5B31E8E9; Thu, 24 Oct 2019 12:41:17 +0200 (CEST) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id CB0FF1E8E0 for ; Thu, 24 Oct 2019 12:41:15 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Oct 2019 03:41:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,224,1569308400"; d="scan'208";a="399721470" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.2]) by fmsmga006.fm.intel.com with ESMTP; 24 Oct 2019 03:41:12 -0700 From: Bruce Richardson To: thomas@monjalon.net Cc: bluca@debian.org, dev@dpdk.org, Bruce Richardson Date: Thu, 24 Oct 2019 11:41:08 +0100 Message-Id: <20191024104108.2331-1-bruce.richardson@intel.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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. Fixes: 6f80f1cd2247 ("build: support disabling drivers with meson") Signed-off-by: Bruce Richardson --- drivers/meson.build | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) 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) - if drv_path in disabled_drivers - build = false - reason = '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 == disable_path + build = false + reason = 'Explicitly disabled via build config' + endif + endforeach + if build # get dependency objs from strings shared_deps = ext_deps static_deps = ext_deps -- 2.21.0