From patchwork Mon Apr 26 10:54:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 92166 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id B6094A0548; Mon, 26 Apr 2021 12:54:18 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3277741104; Mon, 26 Apr 2021 12:54:18 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mails.dpdk.org (Postfix) with ESMTP id E03F740140 for ; Mon, 26 Apr 2021 12:54:15 +0200 (CEST) IronPort-SDR: tziwa8vRhs9bw9WpokY8RDXDMdB2bSulP9Fxjb2l8HDtWuXzbas7iVBTmHypr0m0jUej0HjSCD 0Rii2tx/0C5Q== X-IronPort-AV: E=McAfee;i="6200,9189,9965"; a="193129092" X-IronPort-AV: E=Sophos;i="5.82,252,1613462400"; d="scan'208";a="193129092" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Apr 2021 03:54:12 -0700 IronPort-SDR: ge6JjpTJyTRd+7FljM383D4wqHXPcI18JNJci6uv1e/6jCJAUTofG3ibYsFbJLr5RxXob1FFjg ze7Av4S64+NA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,252,1613462400"; d="scan'208";a="615338335" Received: from silpixa00399126.ir.intel.com ([10.237.223.81]) by fmsmga006.fm.intel.com with ESMTP; 26 Apr 2021 03:54:11 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: thomas@monjalon.net, anatoly.burakov@intel.com, Bruce Richardson Date: Mon, 26 Apr 2021 11:54:02 +0100 Message-Id: <20210426105403.226004-1-bruce.richardson@intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210422090211.320855-1-bruce.richardson@intel.com> References: <20210422090211.320855-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 1/2] devtools: script to check meson indentation of lists 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" This is a script to fix up minor formatting issues in meson files. It scans for, and can optionally fix, indentation issues and missing trailing commas in the lists in meson.build files. It also detects, and can fix, multi-line lists where more than one entry appears on a line. Signed-off-by: Bruce Richardson Reviewed-by: Anatoly Burakov --- devtools/dpdk_meson_check.py | 125 +++++++++++++++++++++++++++++++++++ 1 file changed, 125 insertions(+) create mode 100755 devtools/dpdk_meson_check.py diff --git a/devtools/dpdk_meson_check.py b/devtools/dpdk_meson_check.py new file mode 100755 index 000000000..29f788796 --- /dev/null +++ b/devtools/dpdk_meson_check.py @@ -0,0 +1,125 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2021 Intel Corporation + +''' +A Python script to run some checks on meson.build files in DPDK +''' + +import sys +import os +from os.path import relpath, join +from argparse import ArgumentParser + +VERBOSE = False + + +def scan_dir(path): + '''return meson.build files found in path''' + for root, dirs, files in os.walk(path): + if 'meson.build' in files: + yield(relpath(join(root, 'meson.build'))) + + +def split_code_comments(line): + 'splits a line into a code part and a comment part, returns (code, comment) tuple' + if line.lstrip().startswith('#'): + return ('', line) + elif '#' in line and '#include' not in line: # catch 99% of cases, not 100% + idx = line.index('#') + while (line[idx - 1].isspace()): + idx -= 1 + return line[:idx], line[idx:] + else: + return (line, '') + + +def setline(contents, index, value): + 'sets the contents[index] to value. Returns the line, along with code and comments part' + line = contents[index] = value + code, comments = split_code_comments(line) + return line, code, comments + + +def check_indentation(filename, contents): + '''check that a list or files() is correctly indented''' + infiles = False + inlist = False + edit_count = 0 + for lineno, line in enumerate(contents): + code, comments = split_code_comments(line) + if not code.strip(): + continue + if code.endswith('files('): + if infiles: + raise(f'Error parsing {filename}:{lineno}, got "files(" when already parsing files list') + if inlist: + print(f'Error parsing {filename}:{lineno}, got "files(" when already parsing array list') + infiles = True + indent_count = len(code) - len(code.lstrip(' ')) + indent = ' ' * (indent_count + 8) # double indent required + elif code.endswith('= ['): + if infiles: + raise(f'Error parsing {filename}:{lineno}, got start of array when already parsing files list') + if inlist: + print(f'Error parsing {filename}:{lineno}, got start of array when already parsing array list') + inlist = True + indent_count = len(code) - len(code.lstrip(' ')) + indent = ' ' * (indent_count + 8) # double indent required + elif infiles and (code.endswith(')') or code.strip().startswith(')')): + infiles = False + continue + elif inlist and (code.endswith(']') or code.strip().startswith(']')): + inlist = False + continue + elif inlist or infiles: + # skip further subarrays or lists + if '[' in code or ']' in code: + continue + if not code.startswith(indent) or code[len(indent)] == ' ': + print(f'Error: Incorrect indent at {filename}:{lineno + 1}') + line, code, comments = setline(contents, lineno, indent + line.strip()) + edit_count += 1 + if not code.endswith(','): + print(f'Error: Missing trailing "," in list at {filename}:{lineno + 1}') + line, code, comments = setline(contents, lineno, code + ',' + comments) + edit_count += 1 + if len(code.split(',')) > 2: # only one comma per line + print(f'Error: multiple entries per line in list at {filename}:{lineno +1}') + entries = [e.strip() for e in code.split(',') if e.strip()] + line, code, comments = setline(contents, lineno, + indent + (',\n' + indent).join(entries) + + ',' + comments) + edit_count += 1 + return edit_count + + +def process_file(filename, fix): + '''run checks on file "filename"''' + if VERBOSE: + print(f'Processing {filename}') + with open(filename) as f: + contents = [ln.rstrip() for ln in f.readlines()] + + if check_indentation(filename, contents) > 0 and fix: + print(f"Fixing {filename}") + with open(filename, 'w') as f: + f.writelines([f'{ln}\n' for ln in contents]) + + +def main(): + '''parse arguments and then call other functions to do work''' + global VERBOSE + parser = ArgumentParser(description='Run syntax checks on DPDK meson.build files') + parser.add_argument('-d', metavar='directory', default='.', help='Directory to process') + parser.add_argument('--fix', action='store_true', help='Attempt to fix errors') + parser.add_argument('-v', action='store_true', help='Verbose output') + args = parser.parse_args() + + VERBOSE = args.v + for f in scan_dir(args.d): + process_file(f, args.fix) + + +if __name__ == "__main__": + main() From patchwork Mon Apr 26 10:54:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 92167 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 44766A0548; Mon, 26 Apr 2021 12:54:23 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4FAA8411B0; Mon, 26 Apr 2021 12:54:19 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mails.dpdk.org (Postfix) with ESMTP id A808C40140 for ; Mon, 26 Apr 2021 12:54:16 +0200 (CEST) IronPort-SDR: pJDsKAlt2NNJ6JCHUakHN/PzaMBg6mrAodVyt1fOzkkKQjhvZGBHSUUN6ojWIueZH4NNs5Hn2n a5cIA5T38vwA== X-IronPort-AV: E=McAfee;i="6200,9189,9965"; a="193129097" X-IronPort-AV: E=Sophos;i="5.82,252,1613462400"; d="scan'208";a="193129097" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Apr 2021 03:54:15 -0700 IronPort-SDR: RfPO4iJntqq5dq2edeY34WvhJlCPjbaIzA3iN1qDevAaRFdtZg6vhTX7YLRoP6krs0t0IpDYLh Ja2Q8WN+yf4Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,252,1613462400"; d="scan'208";a="615338343" Received: from silpixa00399126.ir.intel.com ([10.237.223.81]) by fmsmga006.fm.intel.com with ESMTP; 26 Apr 2021 03:54:14 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: thomas@monjalon.net, anatoly.burakov@intel.com, Bruce Richardson Date: Mon, 26 Apr 2021 11:54:03 +0100 Message-Id: <20210426105403.226004-2-bruce.richardson@intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210426105403.226004-1-bruce.richardson@intel.com> References: <20210422090211.320855-1-bruce.richardson@intel.com> <20210426105403.226004-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 2/2] build: style fixup on meson files 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" Running "./devtools/dpdk_meson_check.py --fix" on the DPDK repo fixes a number of issues with whitespace and formatting of files: * indentation of lists * missing trailing commas on final list element * multiple list entries per line when list is not all single-line Signed-off-by: Bruce Richardson --- app/test-eventdev/meson.build | 2 +- config/x86/meson.build | 24 +++++++++---------- drivers/bus/fslmc/meson.build | 2 +- drivers/common/mlx5/meson.build | 2 +- drivers/common/sfc_efx/base/meson.build | 2 +- drivers/common/sfc_efx/meson.build | 4 ++-- drivers/compress/mlx5/meson.build | 2 +- drivers/crypto/bcmfs/meson.build | 2 +- drivers/crypto/nitrox/meson.build | 2 +- drivers/crypto/qat/meson.build | 2 +- drivers/net/e1000/base/meson.build | 2 +- drivers/net/fm10k/base/meson.build | 2 +- drivers/net/i40e/base/meson.build | 2 +- drivers/net/ixgbe/base/meson.build | 2 +- drivers/net/octeontx/base/meson.build | 2 +- drivers/net/sfc/meson.build | 4 ++-- drivers/net/thunderx/base/meson.build | 2 +- drivers/raw/skeleton/meson.build | 2 +- examples/l3fwd/meson.build | 14 +++++------ .../client_server_mp/mp_client/meson.build | 2 +- .../client_server_mp/mp_server/meson.build | 4 +++- examples/multi_process/hotplug_mp/meson.build | 3 ++- examples/multi_process/simple_mp/meson.build | 3 ++- .../multi_process/symmetric_mp/meson.build | 2 +- lib/mbuf/meson.build | 2 +- lib/meson.build | 6 ++--- lib/power/meson.build | 2 +- lib/table/meson.build | 2 +- 28 files changed, 53 insertions(+), 49 deletions(-) diff --git a/app/test-eventdev/meson.build b/app/test-eventdev/meson.build index 04117dbe4..45c3ff456 100644 --- a/app/test-eventdev/meson.build +++ b/app/test-eventdev/meson.build @@ -14,6 +14,6 @@ sources = files( 'test_perf_queue.c', 'test_pipeline_atq.c', 'test_pipeline_common.c', - 'test_pipeline_queue.c' + 'test_pipeline_queue.c', ) deps += 'eventdev' diff --git a/config/x86/meson.build b/config/x86/meson.build index 34b116481..b9348c44d 100644 --- a/config/x86/meson.build +++ b/config/x86/meson.build @@ -22,18 +22,18 @@ foreach f:base_flags endforeach optional_flags = [ - 'AES', - 'AVX', - 'AVX2', - 'AVX512BW', - 'AVX512CD', - 'AVX512DQ', - 'AVX512F', - 'AVX512VL', - 'PCLMUL', - 'RDRND', - 'RDSEED', - 'VPCLMULQDQ', + 'AES', + 'AVX', + 'AVX2', + 'AVX512BW', + 'AVX512CD', + 'AVX512DQ', + 'AVX512F', + 'AVX512VL', + 'PCLMUL', + 'RDRND', + 'RDSEED', + 'VPCLMULQDQ', ] foreach f:optional_flags if cc.get_define('__@0@__'.format(f), args: machine_args) == '1' diff --git a/drivers/bus/fslmc/meson.build b/drivers/bus/fslmc/meson.build index e99218ca7..54be76f51 100644 --- a/drivers/bus/fslmc/meson.build +++ b/drivers/bus/fslmc/meson.build @@ -21,7 +21,7 @@ sources = files( 'portal/dpaa2_hw_dpci.c', 'portal/dpaa2_hw_dpio.c', 'qbman/qbman_portal.c', - 'qbman/qbman_debug.c' + 'qbman/qbman_debug.c', ) includes += include_directories('mc', 'qbman/include', 'portal') diff --git a/drivers/common/mlx5/meson.build b/drivers/common/mlx5/meson.build index b5585d2cc..e78b4f47b 100644 --- a/drivers/common/mlx5/meson.build +++ b/drivers/common/mlx5/meson.build @@ -23,7 +23,7 @@ cflags_options = [ '-Wno-strict-prototypes', '-D_BSD_SOURCE', '-D_DEFAULT_SOURCE', - '-D_XOPEN_SOURCE=600' + '-D_XOPEN_SOURCE=600', ] foreach option:cflags_options if cc.has_argument(option) diff --git a/drivers/common/sfc_efx/base/meson.build b/drivers/common/sfc_efx/base/meson.build index 313e53d77..9fba47b1c 100644 --- a/drivers/common/sfc_efx/base/meson.build +++ b/drivers/common/sfc_efx/base/meson.build @@ -70,7 +70,7 @@ extra_flags = [ '-Wno-unused-parameter', '-Wno-unused-variable', '-Wno-empty-body', - '-Wno-unused-but-set-variable' + '-Wno-unused-but-set-variable', ] c_args = cflags diff --git a/drivers/common/sfc_efx/meson.build b/drivers/common/sfc_efx/meson.build index d87ba396b..f42ccf609 100644 --- a/drivers/common/sfc_efx/meson.build +++ b/drivers/common/sfc_efx/meson.build @@ -19,13 +19,13 @@ extra_flags = [] # Enable more warnings extra_flags += [ - '-Wdisabled-optimization' + '-Wdisabled-optimization', ] # Compiler and version dependent flags extra_flags += [ '-Waggregate-return', - '-Wbad-function-cast' + '-Wbad-function-cast', ] foreach flag: extra_flags diff --git a/drivers/compress/mlx5/meson.build b/drivers/compress/mlx5/meson.build index c5c5edfa7..7aac32998 100644 --- a/drivers/compress/mlx5/meson.build +++ b/drivers/compress/mlx5/meson.build @@ -17,7 +17,7 @@ cflags_options = [ '-Wno-strict-prototypes', '-D_BSD_SOURCE', '-D_DEFAULT_SOURCE', - '-D_XOPEN_SOURCE=600' + '-D_XOPEN_SOURCE=600', ] foreach option:cflags_options if cc.has_argument(option) diff --git a/drivers/crypto/bcmfs/meson.build b/drivers/crypto/bcmfs/meson.build index 0388ba19a..d67e78d51 100644 --- a/drivers/crypto/bcmfs/meson.build +++ b/drivers/crypto/bcmfs/meson.build @@ -16,5 +16,5 @@ sources = files( 'bcmfs_sym_capabilities.c', 'bcmfs_sym_session.c', 'bcmfs_sym.c', - 'bcmfs_sym_engine.c' + 'bcmfs_sym_engine.c', ) diff --git a/drivers/crypto/nitrox/meson.build b/drivers/crypto/nitrox/meson.build index 2fdae03c1..2cc47c462 100644 --- a/drivers/crypto/nitrox/meson.build +++ b/drivers/crypto/nitrox/meson.build @@ -14,5 +14,5 @@ sources = files( 'nitrox_sym.c', 'nitrox_sym_capabilities.c', 'nitrox_sym_reqmgr.c', - 'nitrox_qp.c' + 'nitrox_qp.c', ) diff --git a/drivers/crypto/qat/meson.build b/drivers/crypto/qat/meson.build index 4da819d65..b3b2d1725 100644 --- a/drivers/crypto/qat/meson.build +++ b/drivers/crypto/qat/meson.build @@ -17,7 +17,7 @@ if dep.found() 'qat_asym_pmd.c', 'qat_sym.c', 'qat_sym_hw_dp.c', - 'qat_sym_pmd.c', + 'qat_sym_pmd.c', 'qat_sym_session.c', ) qat_ext_deps += dep diff --git a/drivers/net/e1000/base/meson.build b/drivers/net/e1000/base/meson.build index 99468764e..317692dfa 100644 --- a/drivers/net/e1000/base/meson.build +++ b/drivers/net/e1000/base/meson.build @@ -19,7 +19,7 @@ sources = [ 'e1000_nvm.c', 'e1000_osdep.c', 'e1000_phy.c', - 'e1000_vf.c' + 'e1000_vf.c', ] error_cflags = ['-Wno-uninitialized', '-Wno-unused-parameter', diff --git a/drivers/net/fm10k/base/meson.build b/drivers/net/fm10k/base/meson.build index 6467a1278..ca98d34d4 100644 --- a/drivers/net/fm10k/base/meson.build +++ b/drivers/net/fm10k/base/meson.build @@ -7,7 +7,7 @@ sources = [ 'fm10k_mbx.c', 'fm10k_pf.c', 'fm10k_tlv.c', - 'fm10k_vf.c' + 'fm10k_vf.c', ] error_cflags = ['-Wno-unused-parameter', '-Wno-unused-value', diff --git a/drivers/net/i40e/base/meson.build b/drivers/net/i40e/base/meson.build index c319902cd..79a887a29 100644 --- a/drivers/net/i40e/base/meson.build +++ b/drivers/net/i40e/base/meson.build @@ -8,7 +8,7 @@ sources = [ 'i40e_diag.c', 'i40e_hmc.c', 'i40e_lan_hmc.c', - 'i40e_nvm.c' + 'i40e_nvm.c', ] error_cflags = ['-Wno-sign-compare', '-Wno-unused-value', diff --git a/drivers/net/ixgbe/base/meson.build b/drivers/net/ixgbe/base/meson.build index 4d5e41bde..7d3cec002 100644 --- a/drivers/net/ixgbe/base/meson.build +++ b/drivers/net/ixgbe/base/meson.build @@ -14,7 +14,7 @@ sources = [ 'ixgbe_phy.c', 'ixgbe_vf.c', 'ixgbe_x540.c', - 'ixgbe_x550.c' + 'ixgbe_x550.c', ] error_cflags = ['-Wno-unused-value', diff --git a/drivers/net/octeontx/base/meson.build b/drivers/net/octeontx/base/meson.build index 0a69dfd46..c86a72670 100644 --- a/drivers/net/octeontx/base/meson.build +++ b/drivers/net/octeontx/base/meson.build @@ -4,7 +4,7 @@ sources = [ 'octeontx_pkovf.c', 'octeontx_pkivf.c', - 'octeontx_bgx.c' + 'octeontx_bgx.c', ] depends = ['ethdev', 'mempool_octeontx'] diff --git a/drivers/net/sfc/meson.build b/drivers/net/sfc/meson.build index b58425bf9..ccf5984d8 100644 --- a/drivers/net/sfc/meson.build +++ b/drivers/net/sfc/meson.build @@ -24,13 +24,13 @@ extra_flags += '-Wno-strict-aliasing' # Enable more warnings extra_flags += [ - '-Wdisabled-optimization' + '-Wdisabled-optimization', ] # Compiler and version dependent flags extra_flags += [ '-Waggregate-return', - '-Wbad-function-cast' + '-Wbad-function-cast', ] foreach flag: extra_flags diff --git a/drivers/net/thunderx/base/meson.build b/drivers/net/thunderx/base/meson.build index 9cf4bf553..704ee6577 100644 --- a/drivers/net/thunderx/base/meson.build +++ b/drivers/net/thunderx/base/meson.build @@ -4,7 +4,7 @@ sources = [ 'nicvf_hw.c', 'nicvf_mbox.c', - 'nicvf_bsvf.c' + 'nicvf_bsvf.c', ] c_args = cflags diff --git a/drivers/raw/skeleton/meson.build b/drivers/raw/skeleton/meson.build index b5d87652f..950a33cc2 100644 --- a/drivers/raw/skeleton/meson.build +++ b/drivers/raw/skeleton/meson.build @@ -3,6 +3,6 @@ deps += ['rawdev', 'kvargs', 'mbuf', 'bus_vdev'] sources = files( - 'skeleton_rawdev.c', + 'skeleton_rawdev.c', 'skeleton_rawdev_test.c', ) diff --git a/examples/l3fwd/meson.build b/examples/l3fwd/meson.build index 773ebf478..0830b3eb3 100644 --- a/examples/l3fwd/meson.build +++ b/examples/l3fwd/meson.build @@ -9,11 +9,11 @@ allow_experimental_apis = true deps += ['hash', 'lpm', 'fib', 'eventdev'] sources = files( - 'l3fwd_em.c', - 'l3fwd_event.c', - 'l3fwd_event_internal_port.c', - 'l3fwd_event_generic.c', - 'l3fwd_fib.c', - 'l3fwd_lpm.c', - 'main.c', + 'l3fwd_em.c', + 'l3fwd_event.c', + 'l3fwd_event_internal_port.c', + 'l3fwd_event_generic.c', + 'l3fwd_fib.c', + 'l3fwd_lpm.c', + 'main.c', ) diff --git a/examples/multi_process/client_server_mp/mp_client/meson.build b/examples/multi_process/client_server_mp/mp_client/meson.build index 3c4848bde..c7190b212 100644 --- a/examples/multi_process/client_server_mp/mp_client/meson.build +++ b/examples/multi_process/client_server_mp/mp_client/meson.build @@ -10,5 +10,5 @@ includes += include_directories('../shared') allow_experimental_apis = true sources = files( - 'client.c' + 'client.c', ) diff --git a/examples/multi_process/client_server_mp/mp_server/meson.build b/examples/multi_process/client_server_mp/mp_server/meson.build index 74814e5fe..9e585e80b 100644 --- a/examples/multi_process/client_server_mp/mp_server/meson.build +++ b/examples/multi_process/client_server_mp/mp_server/meson.build @@ -10,5 +10,7 @@ includes += include_directories('../shared') allow_experimental_apis = true sources = files( - 'args.c', 'init.c', 'main.c' + 'args.c', + 'init.c', + 'main.c', ) diff --git a/examples/multi_process/hotplug_mp/meson.build b/examples/multi_process/hotplug_mp/meson.build index ae9290504..a1ad98ca2 100644 --- a/examples/multi_process/hotplug_mp/meson.build +++ b/examples/multi_process/hotplug_mp/meson.build @@ -8,5 +8,6 @@ allow_experimental_apis = true sources = files( - 'commands.c', 'main.c' + 'commands.c', + 'main.c', ) diff --git a/examples/multi_process/simple_mp/meson.build b/examples/multi_process/simple_mp/meson.build index adb06b0a7..359af4384 100644 --- a/examples/multi_process/simple_mp/meson.build +++ b/examples/multi_process/simple_mp/meson.build @@ -8,5 +8,6 @@ allow_experimental_apis = true sources = files( - 'mp_commands.c', 'main.c' + 'mp_commands.c', + 'main.c', ) diff --git a/examples/multi_process/symmetric_mp/meson.build b/examples/multi_process/symmetric_mp/meson.build index a5b988c44..e768a324d 100644 --- a/examples/multi_process/symmetric_mp/meson.build +++ b/examples/multi_process/symmetric_mp/meson.build @@ -8,5 +8,5 @@ allow_experimental_apis = true sources = files( - 'main.c' + 'main.c', ) diff --git a/lib/mbuf/meson.build b/lib/mbuf/meson.build index c8c08220a..0435c5e62 100644 --- a/lib/mbuf/meson.build +++ b/lib/mbuf/meson.build @@ -12,6 +12,6 @@ headers = files( 'rte_mbuf_core.h', 'rte_mbuf_ptype.h', 'rte_mbuf_pool_ops.h', - 'rte_mbuf_dyn.h' + 'rte_mbuf_dyn.h', ) deps += ['mempool'] diff --git a/lib/meson.build b/lib/meson.build index c9a20f65b..64a59abab 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -82,9 +82,9 @@ if is_windows endif optional_libs = [ - 'kni', - 'power', - 'vhost', + 'kni', + 'power', + 'vhost', ] disabled_libs = [] diff --git a/lib/power/meson.build b/lib/power/meson.build index a2cc9fe2e..c1097d32f 100644 --- a/lib/power/meson.build +++ b/lib/power/meson.build @@ -19,6 +19,6 @@ headers = files( 'rte_power.h', 'rte_power_empty_poll.h', 'rte_power_pmd_mgmt.h', - 'rte_power_guest_channel.h' + 'rte_power_guest_channel.h', ) deps += ['timer', 'ethdev'] diff --git a/lib/table/meson.build b/lib/table/meson.build index 230f21ea8..b7b70b805 100644 --- a/lib/table/meson.build +++ b/lib/table/meson.build @@ -36,5 +36,5 @@ deps += ['mbuf', 'port', 'lpm', 'hash', 'acl'] indirect_headers += files( 'rte_lru_arm64.h', 'rte_lru_x86.h', - 'rte_table_hash_func_arm64.h' + 'rte_table_hash_func_arm64.h', )