* [dpdk-dev] [PATCH] meson.build: replace tabs with spaces
@ 2021-11-02 15:50 Stephen Hemminger
2021-11-02 16:19 ` Bruce Richardson
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Hemminger @ 2021-11-02 15:50 UTC (permalink / raw)
To: dev
Cc: Stephen Hemminger, Reshma Pattan, Maryam Tahhan,
Konstantin Ananyev, Nicolas Chautru, Olivier Matz,
Declan Doherty, Ciara Power, Jerin Jacob, Vladimir Medvedkin,
Wisam Jaddo, Cristian Dumitrescu, Ori Kam, Bernard Iremonger,
Bruce Richardson, Ashish Gupta, Fiona Trahe, Ankur Dwivedi,
Anoob Joseph, Tejasree Kondoj, Fan Zhang, Pablo de Lara,
John Griffin, Deepak Kumar Jain, Qiming Yang, Qi Zhang
Per the meson recommendation the meson.build file
should be indented with spaces not tabs.
This patch is semi-automatically generated by running
all the meson.build files through expand command.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
Note: if users (like me) just editconfig setup in their
favorite editor, this would not be a problem.
Also, shouldn't checkpatch be made smarter to catch this?
app/pdump/meson.build | 6 +--
app/proc-info/meson.build | 6 +--
app/test-acl/meson.build | 6 +--
app/test-bbdev/meson.build | 8 ++--
app/test-cmdline/meson.build | 6 +--
app/test-compress-perf/meson.build | 6 +--
app/test-crypto-perf/meson.build | 6 +--
app/test-eventdev/meson.build | 6 +--
app/test-fib/meson.build | 6 +--
app/test-flow-perf/meson.build | 6 +--
app/test-pipeline/meson.build | 6 +--
app/test-regex/meson.build | 6 +--
app/test-sad/meson.build | 6 +--
app/test/meson.build | 6 +--
config/meson.build | 60 +++++++++++++--------------
drivers/compress/octeontx/meson.build | 6 +--
drivers/crypto/cnxk/meson.build | 6 +--
drivers/crypto/ipsec_mb/meson.build | 38 ++++++++---------
drivers/crypto/qat/meson.build | 2 +-
drivers/net/ice/meson.build | 2 +-
20 files changed, 100 insertions(+), 100 deletions(-)
diff --git a/app/pdump/meson.build b/app/pdump/meson.build
index db1fcadbfe2c..b8a507f4e190 100644
--- a/app/pdump/meson.build
+++ b/app/pdump/meson.build
@@ -2,9 +2,9 @@
# Copyright(c) 2018 Intel Corporation
if is_windows
- build = false
- reason = 'not supported on Windows'
- subdir_done()
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
endif
sources = files('main.c')
diff --git a/app/proc-info/meson.build b/app/proc-info/meson.build
index 82ed05bb0b4e..6c6933ac78f2 100644
--- a/app/proc-info/meson.build
+++ b/app/proc-info/meson.build
@@ -2,9 +2,9 @@
# Copyright(c) 2018 Intel Corporation
if is_windows
- build = false
- reason = 'not supported on Windows'
- subdir_done()
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
endif
sources = files('main.c')
diff --git a/app/test-acl/meson.build b/app/test-acl/meson.build
index 14d36b33e930..57ce1b18180e 100644
--- a/app/test-acl/meson.build
+++ b/app/test-acl/meson.build
@@ -2,9 +2,9 @@
# Copyright(c) 2019 Intel Corporation
if is_windows
- build = false
- reason = 'not supported on Windows'
- subdir_done()
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
endif
sources = files('main.c')
diff --git a/app/test-bbdev/meson.build b/app/test-bbdev/meson.build
index a726a5b3fa2a..9a5bdcbd5725 100644
--- a/app/test-bbdev/meson.build
+++ b/app/test-bbdev/meson.build
@@ -2,9 +2,9 @@
# Copyright(c) 2018 Intel Corporation
if is_windows
- build = false
- reason = 'not supported on Windows'
- subdir_done()
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
endif
sources = files(
@@ -24,5 +24,5 @@ if dpdk_conf.has('RTE_BASEBAND_ACC100')
deps += ['baseband_acc100']
endif
if dpdk_conf.has('RTE_LIBRTE_PMD_BBDEV_LA12XX')
- deps += ['baseband_la12xx']
+ deps += ['baseband_la12xx']
endif
diff --git a/app/test-cmdline/meson.build b/app/test-cmdline/meson.build
index 08988212000a..0e6c75accb9c 100644
--- a/app/test-cmdline/meson.build
+++ b/app/test-cmdline/meson.build
@@ -2,9 +2,9 @@
# Copyright(c) 2019 Intel Corporation
if is_windows
- build = false
- reason = 'not supported on Windows'
- subdir_done()
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
endif
sources = files('commands.c', 'cmdline_test.c')
diff --git a/app/test-compress-perf/meson.build b/app/test-compress-perf/meson.build
index f29c6ee86390..52de7d0d103c 100644
--- a/app/test-compress-perf/meson.build
+++ b/app/test-compress-perf/meson.build
@@ -2,9 +2,9 @@
# Copyright(c) 2018 Intel Corporation
if is_windows
- build = false
- reason = 'not supported on Windows'
- subdir_done()
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
endif
sources = files(
diff --git a/app/test-crypto-perf/meson.build b/app/test-crypto-perf/meson.build
index ef3582a87c86..6685aaf07775 100644
--- a/app/test-crypto-perf/meson.build
+++ b/app/test-crypto-perf/meson.build
@@ -2,9 +2,9 @@
# Copyright(c) 2018 Intel Corporation
if is_windows
- build = false
- reason = 'not supported on Windows'
- subdir_done()
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
endif
sources = files(
diff --git a/app/test-eventdev/meson.build b/app/test-eventdev/meson.build
index 17be36067717..a70c074db7f4 100644
--- a/app/test-eventdev/meson.build
+++ b/app/test-eventdev/meson.build
@@ -2,9 +2,9 @@
# Copyright(c) 2017 Cavium, Inc
if is_windows
- build = false
- reason = 'not supported on Windows'
- subdir_done()
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
endif
sources = files(
diff --git a/app/test-fib/meson.build b/app/test-fib/meson.build
index 3360ea02b0c9..584b178ddbac 100644
--- a/app/test-fib/meson.build
+++ b/app/test-fib/meson.build
@@ -2,9 +2,9 @@
# Copyright(c) 2019 Intel Corporation
if is_windows
- build = false
- reason = 'not supported on Windows'
- subdir_done()
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
endif
sources = files('main.c')
diff --git a/app/test-flow-perf/meson.build b/app/test-flow-perf/meson.build
index a33cad9078e8..ff5664d8e541 100644
--- a/app/test-flow-perf/meson.build
+++ b/app/test-flow-perf/meson.build
@@ -2,9 +2,9 @@
# Copyright(c) 2020 Mellanox Technologies, Ltd
if is_windows
- build = false
- reason = 'not supported on Windows'
- subdir_done()
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
endif
sources = files(
diff --git a/app/test-pipeline/meson.build b/app/test-pipeline/meson.build
index 7d123e32fb77..f1e22f936716 100644
--- a/app/test-pipeline/meson.build
+++ b/app/test-pipeline/meson.build
@@ -2,9 +2,9 @@
# Copyright(c) 2019 Intel Corporation
if is_windows
- build = false
- reason = 'not supported on Windows'
- subdir_done()
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
endif
sources = files(
diff --git a/app/test-regex/meson.build b/app/test-regex/meson.build
index 02b101980eb5..453599dc9a26 100644
--- a/app/test-regex/meson.build
+++ b/app/test-regex/meson.build
@@ -2,9 +2,9 @@
# Copyright 2020 Mellanox Technologies, Ltd
if is_windows
- build = false
- reason = 'not supported on Windows'
- subdir_done()
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
endif
sources = files('main.c')
diff --git a/app/test-sad/meson.build b/app/test-sad/meson.build
index 3d15727a0181..30a29b34bcf3 100644
--- a/app/test-sad/meson.build
+++ b/app/test-sad/meson.build
@@ -2,9 +2,9 @@
# Copyright(c) 2019 Intel Corporation
if is_windows
- build = false
- reason = 'not supported on Windows'
- subdir_done()
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
endif
sources = files('main.c')
diff --git a/app/test/meson.build b/app/test/meson.build
index 20f36a18034a..73f198db8172 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -2,9 +2,9 @@
# Copyright(c) 2017 Intel Corporation
if is_windows
- build = false
- reason = 'not supported on Windows'
- subdir_done()
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
endif
if not get_option('tests')
diff --git a/config/meson.build b/config/meson.build
index 59e3d5c57310..3be5e10dcc18 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -324,47 +324,47 @@ endif
max_lcores = get_option('max_lcores')
if max_lcores == 'detect'
- # discovery makes sense only for non-cross builds
- if meson.is_cross_build()
- error('Discovery of max_lcores is not supported for cross-compilation.')
- endif
- # overwrite the default value with discovered values
- max_lcores = run_command(get_cpu_count_cmd).stdout().to_int()
- min_lcores = 2
- # DPDK must be built for at least 2 cores
- if max_lcores < min_lcores
- message('Found less than @0@ cores, building for @0@ cores'.format(min_lcores))
- max_lcores = min_lcores
- else
- message('Found @0@ cores'.format(max_lcores))
- endif
- dpdk_conf.set('RTE_MAX_LCORE', max_lcores)
+ # discovery makes sense only for non-cross builds
+ if meson.is_cross_build()
+ error('Discovery of max_lcores is not supported for cross-compilation.')
+ endif
+ # overwrite the default value with discovered values
+ max_lcores = run_command(get_cpu_count_cmd).stdout().to_int()
+ min_lcores = 2
+ # DPDK must be built for at least 2 cores
+ if max_lcores < min_lcores
+ message('Found less than @0@ cores, building for @0@ cores'.format(min_lcores))
+ max_lcores = min_lcores
+ else
+ message('Found @0@ cores'.format(max_lcores))
+ endif
+ dpdk_conf.set('RTE_MAX_LCORE', max_lcores)
elif max_lcores != 'default'
- # overwrite the default value from arch_subdir with user input
- dpdk_conf.set('RTE_MAX_LCORE', max_lcores.to_int())
+ # overwrite the default value from arch_subdir with user input
+ dpdk_conf.set('RTE_MAX_LCORE', max_lcores.to_int())
endif
max_numa_nodes = get_option('max_numa_nodes')
if max_numa_nodes == 'detect'
- # discovery makes sense only for non-cross builds
- if meson.is_cross_build()
- error('Discovery of max_numa_nodes not supported for cross-compilation.')
- endif
- # overwrite the default value with discovered values
- max_numa_nodes = run_command(get_numa_count_cmd).stdout().to_int()
- message('Found @0@ numa nodes'.format(max_numa_nodes))
- dpdk_conf.set('RTE_MAX_NUMA_NODES', max_numa_nodes)
+ # discovery makes sense only for non-cross builds
+ if meson.is_cross_build()
+ error('Discovery of max_numa_nodes not supported for cross-compilation.')
+ endif
+ # overwrite the default value with discovered values
+ max_numa_nodes = run_command(get_numa_count_cmd).stdout().to_int()
+ message('Found @0@ numa nodes'.format(max_numa_nodes))
+ dpdk_conf.set('RTE_MAX_NUMA_NODES', max_numa_nodes)
elif max_numa_nodes != 'default'
- # overwrite the default value from arch_subdir with user input
- dpdk_conf.set('RTE_MAX_NUMA_NODES', max_numa_nodes.to_int())
+ # overwrite the default value from arch_subdir with user input
+ dpdk_conf.set('RTE_MAX_NUMA_NODES', max_numa_nodes.to_int())
endif
# check that CPU and NUMA counts are set
if not dpdk_conf.has('RTE_MAX_LCORE')
- error('Number of CPU cores not specified.')
+ error('Number of CPU cores not specified.')
endif
if not dpdk_conf.has('RTE_MAX_NUMA_NODES')
- error('Number of NUMA nodes not specified.')
+ error('Number of NUMA nodes not specified.')
endif
# set the install path for the drivers
@@ -429,7 +429,7 @@ if get_option('b_sanitize') == 'address' or get_option('b_sanitize') == 'address
endif
if is_linux and arch_subdir == 'x86' and dpdk_conf.get('RTE_ARCH_64')
- dpdk_conf.set10('RTE_MALLOC_ASAN', true)
+ dpdk_conf.set10('RTE_MALLOC_ASAN', true)
endif
endif
diff --git a/drivers/compress/octeontx/meson.build b/drivers/compress/octeontx/meson.build
index cd8687fde30e..e839007066d7 100644
--- a/drivers/compress/octeontx/meson.build
+++ b/drivers/compress/octeontx/meson.build
@@ -2,9 +2,9 @@
# Copyright(c) 2018 Cavium, Inc
if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
- build = false
- reason = 'only supported on 64-bit Linux'
- subdir_done()
+ build = false
+ reason = 'only supported on 64-bit Linux'
+ subdir_done()
endif
sources = files('otx_zip.c', 'otx_zip_pmd.c')
diff --git a/drivers/crypto/cnxk/meson.build b/drivers/crypto/cnxk/meson.build
index 024109f7e92c..becb46019c4c 100644
--- a/drivers/crypto/cnxk/meson.build
+++ b/drivers/crypto/cnxk/meson.build
@@ -3,9 +3,9 @@
#
if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
- build = false
- reason = 'only supported on 64-bit Linux'
- subdir_done()
+ build = false
+ reason = 'only supported on 64-bit Linux'
+ subdir_done()
endif
sources = files(
diff --git a/drivers/crypto/ipsec_mb/meson.build b/drivers/crypto/ipsec_mb/meson.build
index d7037daea15f..cf37a1816905 100644
--- a/drivers/crypto/ipsec_mb/meson.build
+++ b/drivers/crypto/ipsec_mb/meson.build
@@ -4,30 +4,30 @@
IMB_required_ver = '1.0.0'
lib = cc.find_library('IPSec_MB', required: false)
if not lib.found()
- build = false
- reason = 'missing dependency, "libIPSec_MB"'
+ build = false
+ reason = 'missing dependency, "libIPSec_MB"'
else
- ext_deps += lib
+ ext_deps += lib
- # version comes with quotes, so we split based on " and take the middle
- imb_ver = cc.get_define('IMB_VERSION_STR',
- prefix : '#include<intel-ipsec-mb.h>').split('"')[1]
+ # version comes with quotes, so we split based on " and take the middle
+ imb_ver = cc.get_define('IMB_VERSION_STR',
+ prefix : '#include<intel-ipsec-mb.h>').split('"')[1]
- if (imb_ver == '') or (imb_ver.version_compare('<' + IMB_required_ver))
- reason = 'IPSec_MB version >= @0@ is required, found version @1@'.format(
- IMB_required_ver, imb_ver)
- build = false
- endif
+ if (imb_ver == '') or (imb_ver.version_compare('<' + IMB_required_ver))
+ reason = 'IPSec_MB version >= @0@ is required, found version @1@'.format(
+ IMB_required_ver, imb_ver)
+ build = false
+ endif
endif
sources = files('ipsec_mb_private.c',
- 'ipsec_mb_ops.c',
- 'pmd_aesni_mb.c',
- 'pmd_aesni_gcm.c',
- 'pmd_chacha_poly.c',
- 'pmd_kasumi.c',
- 'pmd_snow3g.c',
- 'pmd_zuc.c'
- )
+ 'ipsec_mb_ops.c',
+ 'pmd_aesni_mb.c',
+ 'pmd_aesni_gcm.c',
+ 'pmd_chacha_poly.c',
+ 'pmd_kasumi.c',
+ 'pmd_snow3g.c',
+ 'pmd_zuc.c'
+ )
deps += ['bus_vdev', 'net', 'security']
diff --git a/drivers/crypto/qat/meson.build b/drivers/crypto/qat/meson.build
index b3b2d1725809..2b4dd9e09fb8 100644
--- a/drivers/crypto/qat/meson.build
+++ b/drivers/crypto/qat/meson.build
@@ -19,7 +19,7 @@ if dep.found()
'qat_sym_hw_dp.c',
'qat_sym_pmd.c',
'qat_sym_session.c',
- )
+ )
qat_ext_deps += dep
qat_cflags += '-DBUILD_QAT_SYM'
qat_cflags += '-DBUILD_QAT_ASYM'
diff --git a/drivers/net/ice/meson.build b/drivers/net/ice/meson.build
index 0b86d74a49bc..be15a2ed0253 100644
--- a/drivers/net/ice/meson.build
+++ b/drivers/net/ice/meson.build
@@ -71,6 +71,6 @@ sources += files('ice_dcf.c',
'ice_dcf_vf_representor.c',
'ice_dcf_ethdev.c',
'ice_dcf_parent.c',
- 'ice_dcf_sched.c')
+ 'ice_dcf_sched.c')
headers = files('rte_pmd_ice.h')
--
2.30.2
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [dpdk-dev] [PATCH] meson.build: replace tabs with spaces
2021-11-02 15:50 [dpdk-dev] [PATCH] meson.build: replace tabs with spaces Stephen Hemminger
@ 2021-11-02 16:19 ` Bruce Richardson
0 siblings, 0 replies; 2+ messages in thread
From: Bruce Richardson @ 2021-11-02 16:19 UTC (permalink / raw)
To: Stephen Hemminger
Cc: dev, Reshma Pattan, Maryam Tahhan, Konstantin Ananyev,
Nicolas Chautru, Olivier Matz, Declan Doherty, Ciara Power,
Jerin Jacob, Vladimir Medvedkin, Wisam Jaddo,
Cristian Dumitrescu, Ori Kam, Bernard Iremonger, Ashish Gupta,
Fiona Trahe, Ankur Dwivedi, Anoob Joseph, Tejasree Kondoj,
Fan Zhang, Pablo de Lara, John Griffin, Deepak Kumar Jain,
Qiming Yang, Qi Zhang
On Tue, Nov 02, 2021 at 08:50:55AM -0700, Stephen Hemminger wrote:
> Per the meson recommendation the meson.build file
> should be indented with spaces not tabs.
> This patch is semi-automatically generated by running
> all the meson.build files through expand command.
>
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> ---
> Note: if users (like me) just editconfig setup in their
> favorite editor, this would not be a problem.
>
> Also, shouldn't checkpatch be made smarter to catch this?
>
> app/pdump/meson.build | 6 +--
> app/proc-info/meson.build | 6 +--
> app/test-acl/meson.build | 6 +--
> app/test-bbdev/meson.build | 8 ++--
> app/test-cmdline/meson.build | 6 +--
> app/test-compress-perf/meson.build | 6 +--
> app/test-crypto-perf/meson.build | 6 +--
> app/test-eventdev/meson.build | 6 +--
> app/test-fib/meson.build | 6 +--
> app/test-flow-perf/meson.build | 6 +--
> app/test-pipeline/meson.build | 6 +--
> app/test-regex/meson.build | 6 +--
> app/test-sad/meson.build | 6 +--
> app/test/meson.build | 6 +--
> config/meson.build | 60 +++++++++++++--------------
> drivers/compress/octeontx/meson.build | 6 +--
> drivers/crypto/cnxk/meson.build | 6 +--
> drivers/crypto/ipsec_mb/meson.build | 38 ++++++++---------
> drivers/crypto/qat/meson.build | 2 +-
> drivers/net/ice/meson.build | 2 +-
> 20 files changed, 100 insertions(+), 100 deletions(-)
>
Yes, this should be caught automatically, and David M. has already proposed
a patch to automatically check for this [1].
For your patch specifically, most of the tabs need to be replaced by
4-chars rather than 8-chars of space. The last indent (drivers/net/ice) is
the one exception, I believe, and requires an 8-space indent.
Regards,
/Bruce
[1] http://patches.dpdk.org/project/dpdk/patch/20211022205531.9966-1-david.marchand@redhat.com/
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-11-02 16:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-02 15:50 [dpdk-dev] [PATCH] meson.build: replace tabs with spaces Stephen Hemminger
2021-11-02 16:19 ` Bruce Richardson
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).