From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1806AA0C4E; Tue, 2 Nov 2021 16:51:04 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D06CA4113F; Tue, 2 Nov 2021 16:51:03 +0100 (CET) Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by mails.dpdk.org (Postfix) with ESMTP id 7C74E41139 for ; Tue, 2 Nov 2021 16:51:02 +0100 (CET) Received: by mail-pg1-f175.google.com with SMTP id x5so10713846pgk.11 for ; Tue, 02 Nov 2021 08:51:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=CiWoewRZAfc1UArDOGZMNk/l2d5T/SL5zIi+Qcp1qyA=; b=wgr6OjKyOYWECMm1IOLJfUV/swsTI7yLfcuNLSZ+pLt8ciooCoDMRdKXkssFJUnmhT ok4POpbLp1bdGN0e49L5YY8KxspvQmunQz7jTCWNIxMRT2wtNNhoS/THat5X9jI+Pp/F ZBP9n0hksNIddXcdeAvc4ZsRjD18NKL50qksh9+DzlVwMxbQStVHhffWjbG4HiwCAbry a05zoH5wxneB3FjYQnI1DCRswBrhFSASi49QXup6hJnEv+1d+JV61KiOjrzOPz5xZnY1 3g/3zBwzNKU1iCM9KF7SBR7CoPSEfq01FVc9EpIzziA+Qv6+JQcGbAvHHy/WPOaSHMTN dQnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=CiWoewRZAfc1UArDOGZMNk/l2d5T/SL5zIi+Qcp1qyA=; b=FkHmp5Q4riGFZzfwHM+e9WbmuEQUBnjXiPmD9K4oxl7cC5mXm2saPbZkM69j4bj4bU 6VmZFxg5U0KERXykUB7HowXRuc3OjRqsiXdIOgHcjSszLgcbilsIfiMA3GILu1BQYOQF xXynCHCCXq0r0cIYhyjEPIUfw66+iItEZcIUVLpMQAstx0bCrlg4iNo2nJE29OdeiY2A Aiw0RvsXScgH2p9fYnSqWMpiHFym7n2yjyEakeaAKvFA87DVJDjwIUXaT117fqt1xslc Hey+f6vTI3v/eykbu+1ipceTwemutMP7TqLE7rci7gzMM4dGrU4Yp0p/Pik6np3TqhWh D+DQ== X-Gm-Message-State: AOAM530qyMB1/Pqh4OAQzsR6p2Hp+OIuf+2mBHy11gLXU2WD839ufObH 8BUwijzT7rKej06e88amvcyqt+gCOrE9ZA== X-Google-Smtp-Source: ABdhPJwd6L1jy4WpXmHBT5xB5yd29ANKNB66F6DuElQaIJCY2sih+9CzD7gbpSQMZIW0Muevejtp/Q== X-Received: by 2002:aa7:8019:0:b0:44d:d761:6f79 with SMTP id j25-20020aa78019000000b0044dd7616f79mr37763473pfi.3.1635868261090; Tue, 02 Nov 2021 08:51:01 -0700 (PDT) Received: from hermes.local (204-195-33-123.wavecable.com. [204.195.33.123]) by smtp.gmail.com with ESMTPSA id f8sm2905908pjq.29.2021.11.02.08.50.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Nov 2021 08:51:00 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org 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 Date: Tue, 2 Nov 2021 08:50:55 -0700 Message-Id: <20211102155055.214735-1-stephen@networkplumber.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH] meson.build: replace tabs with spaces X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 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" 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 --- 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').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').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