DPDK patches and discussions
 help / color / mirror / Atom feed
From: Bruce Richardson <bruce.richardson@intel.com>
To: thomas@monjalon.net
Cc: bluca@debian.org, dev@dpdk.org,
	Bruce Richardson <bruce.richardson@intel.com>
Subject: [dpdk-dev] [PATCH] build: fix compatibility with meson 0.47
Date: Thu, 24 Oct 2019 11:41:08 +0100	[thread overview]
Message-ID: <20191024104108.2331-1-bruce.richardson@intel.com> (raw)

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 <bruce.richardson@intel.com>
---
 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


             reply	other threads:[~2019-10-24 10:41 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-24 10:41 Bruce Richardson [this message]
2019-10-24 12:17 ` Luca Boccassi
2019-10-25  7:44   ` Thomas Monjalon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191024104108.2331-1-bruce.richardson@intel.com \
    --to=bruce.richardson@intel.com \
    --cc=bluca@debian.org \
    --cc=dev@dpdk.org \
    --cc=thomas@monjalon.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).