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 67C66A00C3; Sun, 30 Oct 2022 01:18:01 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 56A384280E; Sun, 30 Oct 2022 01:18:01 +0200 (CEST) Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) by mails.dpdk.org (Postfix) with ESMTP id E97D74280C for ; Sun, 30 Oct 2022 01:17:59 +0200 (CEST) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 9D3C15C0090; Sat, 29 Oct 2022 19:17:59 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Sat, 29 Oct 2022 19:17:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm3; t=1667085479; x=1667171879; bh=OM cptTW21hH+iqYF4WtL5bTuRcYZxnz8qkR56e+o0JI=; b=fqLWWH8WkqnbFc4El9 e1Ychec9CbwoFC2UOhWZC9760NOs/4vK7rE0LXCZonu1iSWJKzLJOW3wZU1McQXx OnZdrZm0J8I2A/WYhdNDYQdngGvAdSZoV51XHHknYx+uLd/VVVvSNczeFoIiR3W/ KvJTpVvOz6HJEkVg5ryVilH+ylhuqT8fvIqdYxZAiCx/i0DCbIOOFfftySSgWpjH TdmmiCEdzR2EHrbUZdoLanw9Y1MCzNt/8/R1rRkbSOAWET9SoinWWcRZeZLzE74I +SSlJPyIoOOMnVZDOqOserFFzJ7Mt4+EDnltwvxoTz1z3lR4hpIY+hgDlaB67p3T HF1g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1667085479; x=1667171879; bh=OMcptTW21hH+i qYF4WtL5bTuRcYZxnz8qkR56e+o0JI=; b=cL4IkQKmVnR9vqyxyCAPpqQ196KHX vhce6TGtVvXOkePl2dT2Ht1Aj1HCoOIYZjaAZLoYHorqIF+dqy8ZHpKUSXJOxYxe daP2iQsrohU1Cn2MtPZYY/92txlS837yZb6Xrtkf2MdDknhF0rVg9njDu77ILEtq fWZsnUarXOfVqo6J2taGbAll6LiccheNCp9TzP1aO8QXi2r2FEAkN2ZQcHBnqGPY hk1DWiXerXmyzWNlmX9m+RiRhwNN1zDMj8A6FohRAF9sSJz69a8bzTxIdmA2zU99 z+tSzmaJy7gm81qSGHJhG6sCVnbfs9LnswQJL3ZBkJGHEvorqTc9YMV0w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrtdelgddvudcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefvhhhomhgr shcuofhonhhjrghlohhnuceothhhohhmrghssehmohhnjhgrlhhonhdrnhgvtheqnecugg ftrfgrthhtvghrnhepvdejhfdugeehvddtieejieegteeuudfgjeeukeeiledthfetveek hefhieelhfdtnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrh homhepthhhohhmrghssehmohhnjhgrlhhonhdrnhgvth X-ME-Proxy: Feedback-ID: i47234305:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 29 Oct 2022 19:17:57 -0400 (EDT) From: Thomas Monjalon To: dev@dpdk.org Cc: valex@nvidia.com, ferruh.yigit@amd.com, andrew.rybchenko@oktetlabs.ru, rasland@nvidia.com, avid.marchand@redhat.com, Matan Azrad , Viacheslav Ovsiienko Subject: [PATCH 2/2] common/mlx5: move Meson config initialization and check Date: Sun, 30 Oct 2022 01:17:11 +0200 Message-Id: <20221029231712.773630-3-thomas@monjalon.net> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20221029231712.773630-1-thomas@monjalon.net> References: <20221029231712.773630-1-thomas@monjalon.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 The variable mlx5_config may be used by other mlx5 drivers and should be always initialized. By moving its initialization (with configuration file generation), it is made consistent for Linux and Windows builds. And the check of mlx5_config in net/mlx5 is moved at the top of net/mlx5/hws/meson.build so HWS requirements are in the right context. Signed-off-by: Thomas Monjalon --- drivers/common/mlx5/linux/meson.build | 2 -- drivers/common/mlx5/meson.build | 2 ++ drivers/common/mlx5/windows/meson.build | 4 ---- drivers/net/mlx5/hws/meson.build | 4 ++++ drivers/net/mlx5/meson.build | 4 +--- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/drivers/common/mlx5/linux/meson.build b/drivers/common/mlx5/linux/meson.build index 84e2a1ad8c..2b57b299bd 100644 --- a/drivers/common/mlx5/linux/meson.build +++ b/drivers/common/mlx5/linux/meson.build @@ -8,7 +8,6 @@ dlopen_ibverbs = (get_option('ibverbs_link') == 'dlopen') LIB_GLUE_BASE = 'librte_common_mlx5_glue.so' LIB_GLUE_VERSION = abi_version LIB_GLUE = LIB_GLUE_BASE + '.' + LIB_GLUE_VERSION -mlx5_config = configuration_data() if dlopen_ibverbs dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1) cflags += [ @@ -232,7 +231,6 @@ foreach arg:has_member_args file_prefix = '#include <' + arg[1] + '>' mlx5_config.set(arg[0], cc.has_member(arg[2], arg[3], prefix : file_prefix, dependencies: libs)) endforeach -configure_file(output : 'mlx5_autoconf.h', configuration : mlx5_config) # Build Glue Library if dlopen_ibverbs diff --git a/drivers/common/mlx5/meson.build b/drivers/common/mlx5/meson.build index 6ddbde7e8f..d7ca21d2cf 100644 --- a/drivers/common/mlx5/meson.build +++ b/drivers/common/mlx5/meson.build @@ -37,4 +37,6 @@ else cflags += [ '-UPEDANTIC' ] endif +mlx5_config = configuration_data() subdir(exec_env) +configure_file(output : 'mlx5_autoconf.h', configuration : mlx5_config) diff --git a/drivers/common/mlx5/windows/meson.build b/drivers/common/mlx5/windows/meson.build index edbbaa9ae1..cc486014a8 100644 --- a/drivers/common/mlx5/windows/meson.build +++ b/drivers/common/mlx5/windows/meson.build @@ -39,7 +39,3 @@ if get_option('buildtype').contains('debug') else cflags += [ '-UPEDANTIC' ] endif - -# Generate an empty mlx5_autoconf.h file for compatibility with Linux -config = configuration_data() -configure_file(output : 'mlx5_autoconf.h', configuration : config) diff --git a/drivers/net/mlx5/hws/meson.build b/drivers/net/mlx5/hws/meson.build index d2bb864fd2..38776d5163 100644 --- a/drivers/net/mlx5/hws/meson.build +++ b/drivers/net/mlx5/hws/meson.build @@ -1,6 +1,10 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright (c) 2022 NVIDIA Corporation & Affiliates +if not (is_linux and mlx5_config.get('HAVE_IBV_FLOW_DV_SUPPORT', false)) + subdir_done() +endif + includes += include_directories('.') sources += files( 'mlx5dr_context.c', diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build index 9a8eb0bc19..66b23f5584 100644 --- a/drivers/net/mlx5/meson.build +++ b/drivers/net/mlx5/meson.build @@ -77,6 +77,4 @@ testpmd_sources += files('mlx5_testpmd.c') subdir(exec_env) -if (is_linux and mlx5_config.get('HAVE_IBV_FLOW_DV_SUPPORT', false)) - subdir('hws') -endif +subdir('hws') -- 2.36.1