From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: Bruce Richardson <bruce.richardson@intel.com>
Subject: [dpdk-dev] [PATCH] build: fix compatibility with meson 0.41 onwards
Date: Tue, 18 Sep 2018 11:55:52 +0100 [thread overview]
Message-ID: <20180918105552.58464-1-bruce.richardson@intel.com> (raw)
Versions of meson prior to 0.47 flattened the parameters to the
"set_variable" function, which meant that the function could not take
array variables as a parameter. Therefore, we need to disable driver
tracking for those older versions, in order to maintain compatibility
with the minimum supported 0.41 version, and also v0.45 shipped in
Ubuntu 18.04 release.
Fixes: 806c45dd483d ("build: add configuration summary at end of config")
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
drivers/meson.build | 5 ++++-
meson.build | 33 +++++++++++++++++++--------------
2 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/drivers/meson.build b/drivers/meson.build
index b6ce974de..c5df313dd 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -145,5 +145,8 @@ foreach class:driver_classes
endif # build
endforeach
- set_variable(class + '_drivers', class_drivers)
+ if meson.version().version_compare('>=0.47')
+ # prior to 0.47, set_variable can't take array params
+ set_variable(class + '_drivers', class_drivers)
+ endif
endforeach
diff --git a/meson.build b/meson.build
index 7332e75b5..2ed1247a3 100644
--- a/meson.build
+++ b/meson.build
@@ -89,18 +89,23 @@ foreach lib:enabled_libs
endforeach
message(output_message + '\n')
-output_message = '\n===============\nDrivers Enabled\n===============\n'
-foreach class:driver_classes
- class_drivers = get_variable(class + '_drivers')
- output_message += '\n' + class + ':\n\t'
- output_count = 0
- foreach drv:class_drivers
- output_message += drv + ', '
- output_count += 1
- if output_count == 8
- output_message += '\n\t'
- output_count = 0
- endif
+
+# prior to 0.47 set_variable didn't work with arrays, so we can't
+# track driver lists easily
+if meson.version().version_compare('>=0.47')
+ output_message = '\n===============\nDrivers Enabled\n===============\n'
+ foreach class:driver_classes
+ class_drivers = get_variable(class + '_drivers')
+ output_message += '\n' + class + ':\n\t'
+ output_count = 0
+ foreach drv:class_drivers
+ output_message += drv + ', '
+ output_count += 1
+ if output_count == 8
+ output_message += '\n\t'
+ output_count = 0
+ endif
+ endforeach
endforeach
-endforeach
-message(output_message + '\n')
+ message(output_message + '\n')
+endif
--
2.17.1
next reply other threads:[~2018-09-18 10:56 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-18 10:55 Bruce Richardson [this message]
2018-09-18 12:44 ` Timothy Redaelli
2018-09-18 13:19 ` 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=20180918105552.58464-1-bruce.richardson@intel.com \
--to=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
/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).