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 0AF0AA00C2; Sun, 30 Oct 2022 09:27:42 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9C89E40693; Sun, 30 Oct 2022 09:27:41 +0100 (CET) Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by mails.dpdk.org (Postfix) with ESMTP id A563040151 for ; Sun, 30 Oct 2022 09:27:40 +0100 (CET) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 2F6455C00D9; Sun, 30 Oct 2022 04:27:40 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Sun, 30 Oct 2022 04:27:40 -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=1667118460; x=1667204860; bh=iO jBVy09AB4lrZrcl6OqG1VJrmzleaO7CK94uUM6h20=; b=vTZGQa1pHeOgKs1SSU C/un3+F341n09DlRp+8w0UhAo0vKsBOgSGEeBghjh1JIqjLmrNHonFLPoC4LMMnO zvdqIA/3SBzLnGejFZHZSqj27e4ir8bA0n3iBtgrXmns3nF50xC9K+3ttmrrfaTx qfc64LnWr124xIEkQPpHO0nTY0nvmlvpxB7EwZoonhLrvNzwlAVj2iNZbRWTCywa R/dHAI+RMQgwWWtMw/BMhYhphGhGs7sB9uz4P7EPToMzwbSTy6ZKCZwJeLjo7daw vxi3HTnMI6tpoifyuEhq68Gv4iRBonARF/R9H1CqoKfqgmmtJGK/k8BosKHP94pk 58Hw== 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=1667118460; x=1667204860; bh=iOjBVy09AB4lr Zrcl6OqG1VJrmzleaO7CK94uUM6h20=; b=U3Csuk5B7QPwsR2/v93URcRr9BuA+ oBXUi6SreDMaN7gru7G1mLhIhiPVOLtKPJFDjPK6uFShG3TySKlFAbb+CUjSK15r TWAxfqeATga/xiOJcWyc4GDUK5eXW8fMfl68Lk+ePSKrAklX4qus9j78mgFMeQty UwaZlyjbV2EmLBXwLYOvTH6kJ+TJblkoiaLiOZPrZjUzrgslbevnJw1n1qK2sufE eR/Vg1BlZZULFeOsTxKJeQTcAk55rd/1BtmfTz9G7/b9MjhMriGAOfTM/WKbDqsM 9+OmFwV8MHK5Aylk8RieIaUaLSP3ceK8gC6sMLEdO7t/9Ph8qb7Ckb1oQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrtdelgddufeegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomhepvfhhohhm rghsucfoohhnjhgrlhhonhcuoehthhhomhgrshesmhhonhhjrghlohhnrdhnvghtqeenuc ggtffrrghtthgvrhhnpedvjefhudeghedvtdeijeeigeetuedugfejueekieeltdfhteev keehhfeilefhtdenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepmhgrihhlfh hrohhmpehthhhomhgrshesmhhonhhjrghlohhnrdhnvght X-ME-Proxy: Feedback-ID: i47234305:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 30 Oct 2022 04:27:38 -0400 (EDT) From: Thomas Monjalon To: dev@dpdk.org Cc: valex@nvidia.com, ferruh.yigit@amd.com, andrew.rybchenko@oktetlabs.ru, rasland@nvidia.com, david.marchand@redhat.com, Matan Azrad , Fan Zhang , Ashish Gupta , Viacheslav Ovsiienko , Ori Kam Subject: [PATCH v2 1/2] common/mlx5: fix build disabling Date: Sun, 30 Oct 2022 09:27:21 +0100 Message-Id: <20221030082722.1333530-2-thomas@monjalon.net> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20221030082722.1333530-1-thomas@monjalon.net> References: <20221030082722.1333530-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 If the dependency common/mlx5 is explicitly disabled, but net/mlx5 is not explicitly disabled, Meson will read the full recipe of net/mlx5 and will fail when accessing a variable from common/mlx5: drivers/net/mlx5/meson.build:76:4: ERROR: Unknown variable "mlx5_config". The solution is to stop parsing net/mlx5 if common/mlx5 is disabled. The deps array must be defined before stopping, in order to automatically disable the build of net/mlx5 and print the reason. The same protection is applied to other mlx5 drivers, so it will allow using the variable mlx5_config in future. Fixes: 22681deead3e ("net/mlx5/hws: enable hardware steering") Reported-by: Andrew Rybchenko Signed-off-by: Thomas Monjalon Tested-by: Andrew Rybchenko --- drivers/compress/mlx5/meson.build | 5 +++++ drivers/crypto/mlx5/meson.build | 5 +++++ drivers/net/mlx5/meson.build | 5 +++++ drivers/regex/mlx5/meson.build | 5 +++++ drivers/vdpa/mlx5/meson.build | 5 +++++ 5 files changed, 25 insertions(+) diff --git a/drivers/compress/mlx5/meson.build b/drivers/compress/mlx5/meson.build index 7aac329986..49ce3aff46 100644 --- a/drivers/compress/mlx5/meson.build +++ b/drivers/compress/mlx5/meson.build @@ -9,6 +9,11 @@ endif fmt_name = 'mlx5_compress' deps += ['common_mlx5', 'eal', 'compressdev'] +if not ('mlx5' in common_drivers) + # avoid referencing undefined variables from common/mlx5 + subdir_done() +endif + sources = files( 'mlx5_compress.c', ) diff --git a/drivers/crypto/mlx5/meson.build b/drivers/crypto/mlx5/meson.build index 9d9c9c00bc..7521c4c671 100644 --- a/drivers/crypto/mlx5/meson.build +++ b/drivers/crypto/mlx5/meson.build @@ -9,6 +9,11 @@ endif fmt_name = 'mlx5_crypto' deps += ['common_mlx5', 'eal', 'cryptodev'] +if not ('mlx5' in common_drivers) + # avoid referencing undefined variables from common/mlx5 + subdir_done() +endif + sources = files( 'mlx5_crypto.c', 'mlx5_crypto_dek.c', diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build index ff84448186..fa15158039 100644 --- a/drivers/net/mlx5/meson.build +++ b/drivers/net/mlx5/meson.build @@ -9,6 +9,11 @@ if not (is_linux or is_windows) endif deps += ['hash', 'common_mlx5'] +if not ('mlx5' in common_drivers) + # avoid referencing undefined variables from common/mlx5 + subdir_done() +endif + headers = files('rte_pmd_mlx5.h') sources = files( 'mlx5.c', diff --git a/drivers/regex/mlx5/meson.build b/drivers/regex/mlx5/meson.build index e553dcb83d..70edc5b6da 100644 --- a/drivers/regex/mlx5/meson.build +++ b/drivers/regex/mlx5/meson.build @@ -8,6 +8,11 @@ if not is_linux endif deps += ['common_mlx5', 'eal', 'regexdev'] +if not ('mlx5' in common_drivers) + # avoid referencing undefined variables from common/mlx5 + subdir_done() +endif + sources = files( 'mlx5_regex.c', 'mlx5_rxp.c', diff --git a/drivers/vdpa/mlx5/meson.build b/drivers/vdpa/mlx5/meson.build index 9d8dbb1a82..54a4eac6f4 100644 --- a/drivers/vdpa/mlx5/meson.build +++ b/drivers/vdpa/mlx5/meson.build @@ -8,6 +8,11 @@ if not is_linux endif deps += ['hash', 'common_mlx5', 'vhost', 'pci', 'eal', 'sched'] +if not ('mlx5' in common_drivers) + # avoid referencing undefined variables from common/mlx5 + subdir_done() +endif + sources = files( 'mlx5_vdpa.c', 'mlx5_vdpa_mem.c', -- 2.36.1