From: Dharmik Thakkar <dharmik.thakkar@arm.com>
To: Thomas Monjalon <thomas@monjalon.net>
Cc: dev@dpdk.org, nd@arm.com, Dharmik Thakkar <dharmik.thakkar@arm.com>
Subject: [dpdk-dev] [PATCH 1/2] config/arm: avoid variable reuse
Date: Tue, 25 Aug 2020 16:13:16 -0500 [thread overview]
Message-ID: <20200825211317.8358-1-dharmik.thakkar@arm.com> (raw)
Rename 'machine' to 'machine_properties' in config/arm/meson.build since
'machine' is previously being used in config/meson.build
Signed-off-by: Dharmik Thakkar <dharmik.thakkar@arm.com>
Reviewed-by: Ruifeng Wang <ruifeng.wang@arm.com>
---
config/arm/meson.build | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/config/arm/meson.build b/config/arm/meson.build
index 8728051d5e38..e89ecdc4ccd2 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -141,12 +141,12 @@ else
dpdk_conf.set('RTE_CACHE_LINE_SIZE', 128)
dpdk_conf.set('RTE_ARCH_ARM64', 1)
- machine = []
+ machine_properties = []
cmd_generic = ['generic', '', '', 'default', '']
cmd_output = cmd_generic # Set generic by default
machine_args = [] # Clear previous machine args
if arm_force_default_march and not meson.is_cross_build()
- machine = impl_generic
+ machine_properties = impl_generic
impl_pn = 'default'
elif not meson.is_cross_build()
# The script returns ['Implementer', 'Variant', 'Architecture',
@@ -158,9 +158,9 @@ else
cmd_output = cmd.stdout().to_lower().strip().split(' ')
endif
# Set to generic if variable is not found
- machine = get_variable('impl_' + cmd_output[0], ['generic'])
- if machine[0] == 'generic'
- machine = impl_generic
+ machine_properties = get_variable('impl_' + cmd_output[0], ['generic'])
+ if machine_properties[0] == 'generic'
+ machine_properties = impl_generic
cmd_output = cmd_generic
endif
impl_pn = cmd_output[3]
@@ -170,7 +170,7 @@ else
else
impl_id = meson.get_cross_property('implementor_id', 'generic')
impl_pn = meson.get_cross_property('implementor_pn', 'default')
- machine = get_variable('impl_' + impl_id)
+ machine_properties = get_variable('impl_' + impl_id)
endif
# Apply Common Defaults. These settings may be overwritten by machine
@@ -181,14 +181,14 @@ else
endif
endforeach
- message('Implementer : ' + machine[0])
- foreach flag: machine[1]
+ message('Implementer : ' + machine_properties[0])
+ foreach flag: machine_properties[1]
if flag.length() > 0
dpdk_conf.set(flag[0], flag[1])
endif
endforeach
- foreach marg: machine[2]
+ foreach marg: machine_properties[2]
if marg[0] == impl_pn
foreach flag: marg[1]
if cc.has_argument(flag)
--
2.17.1
next reply other threads:[~2020-08-25 21:14 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-25 21:13 Dharmik Thakkar [this message]
2020-08-25 21:13 ` [dpdk-dev] [PATCH 2/2] build: find max lcore programmatically Dharmik Thakkar
2020-08-26 4:47 ` Jerin Jacob
2020-08-26 4:55 ` Dharmik Thakkar
2020-09-03 6:20 ` Juraj Linkeš
2020-09-03 22:52 ` Stephen Hemminger
2020-09-04 5:43 ` Dharmik Thakkar
2020-09-17 9:56 ` Juraj Linkeš
2020-09-18 5:47 ` Dharmik Thakkar
2020-10-13 14:31 ` Thomas Monjalon
2020-10-13 14:58 ` Juraj Linkeš
2020-10-13 15:14 ` Dharmik Thakkar
2020-10-14 6:53 ` Juraj Linkeš
2020-10-14 13:28 ` Dharmik Thakkar
2020-09-04 5:26 ` Dharmik Thakkar
2020-09-17 9:33 ` [dpdk-dev] [PATCH 1/2] config/arm: avoid variable reuse Juraj Linkeš
2020-09-18 5:26 ` Dharmik Thakkar
2020-09-18 8:40 ` Juraj Linkeš
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=20200825211317.8358-1-dharmik.thakkar@arm.com \
--to=dharmik.thakkar@arm.com \
--cc=dev@dpdk.org \
--cc=nd@arm.com \
--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).