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 67F1BA00C3; Thu, 20 Jan 2022 11:55:12 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5C637426E2; Thu, 20 Jan 2022 11:55:12 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 514A8426DF for ; Thu, 20 Jan 2022 11:55:10 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1642676109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tS5hqwu+cRKWqCSWUk9lRRl/sHavBC73Po1gKkQKOTw=; b=Na0nTsbNQq8Xoly3uWeA831XJSjlVGiBlM6dJzLK+nsDCGsf8PA0WxMT8BrALVicvrqSXp xV1crDdFo3+k7TjsDTG933xPIGIu5kANV8Xb7TZ/OCuHF7eIfKnK+uJ3STqO7bl46lDuDo cZG1BdfAjD0l6vGLm0AZXmWc0sj24/E= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-362-ktaaT5OsMkSTq6pjDdRm0g-1; Thu, 20 Jan 2022 05:55:06 -0500 X-MC-Unique: ktaaT5OsMkSTq6pjDdRm0g-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 60EC8192AB6E; Thu, 20 Jan 2022 10:55:05 +0000 (UTC) Received: from dmarchan.remote.csb (unknown [10.40.195.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id 23B5873166; Thu, 20 Jan 2022 10:55:02 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: bruce.richardson@intel.com, Ferruh Yigit , Stephen Hemminger , Long Li , Maxime Coquelin , Chenbo Xia , Nipun Gupta , Xiao Wang Subject: [PATCH] build: remove custom dependency checks in drivers Date: Thu, 20 Jan 2022 11:54:21 +0100 Message-Id: <20220120105421.27200-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=david.marchand@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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 Some drivers currently have their own checks and give some non consistent reasons when an internal dependency is unavailable. drivers/meson.build also checks for internal dependencies via 'deps'. Let's rely on it for consistency, and smaller code. Signed-off-by: David Marchand --- drivers/net/kni/meson.build | 5 +---- drivers/net/netvsc/meson.build | 4 +--- drivers/net/vhost/meson.build | 4 +--- drivers/raw/dpaa2_cmdif/meson.build | 2 -- drivers/raw/dpaa2_qdma/meson.build | 2 -- drivers/vdpa/ifc/meson.build | 4 +--- 6 files changed, 4 insertions(+), 17 deletions(-) diff --git a/drivers/net/kni/meson.build b/drivers/net/kni/meson.build index c0751aeb59..2acc989694 100644 --- a/drivers/net/kni/meson.build +++ b/drivers/net/kni/meson.build @@ -7,8 +7,5 @@ if is_windows subdir_done() endif -# this driver can be built if-and-only-if KNI library is buildable -build = dpdk_conf.has('RTE_LIB_KNI') -reason = 'missing dependency, DPDK KNI library' -sources = files('rte_eth_kni.c') deps += 'kni' +sources = files('rte_eth_kni.c') diff --git a/drivers/net/netvsc/meson.build b/drivers/net/netvsc/meson.build index f74b941f65..399400dd01 100644 --- a/drivers/net/netvsc/meson.build +++ b/drivers/net/netvsc/meson.build @@ -7,8 +7,7 @@ if is_windows subdir_done() endif -build = dpdk_conf.has('RTE_BUS_VMBUS') -reason = 'missing dependency, DPDK VMBus driver' +deps += 'bus_vmbus' sources = files( 'hn_ethdev.c', 'hn_nvs.c', @@ -17,4 +16,3 @@ sources = files( 'hn_vf.c', ) -deps += ['bus_vmbus' ] diff --git a/drivers/net/vhost/meson.build b/drivers/net/vhost/meson.build index 858b79fdf5..f481a3a4b8 100644 --- a/drivers/net/vhost/meson.build +++ b/drivers/net/vhost/meson.build @@ -7,8 +7,6 @@ if is_windows subdir_done() endif -build = dpdk_conf.has('RTE_LIB_VHOST') -reason = 'missing dependency, DPDK vhost library' +deps += 'vhost' sources = files('rte_eth_vhost.c') headers = files('rte_eth_vhost.h') -deps += 'vhost' diff --git a/drivers/raw/dpaa2_cmdif/meson.build b/drivers/raw/dpaa2_cmdif/meson.build index 8824f887ce..3b1d3371b2 100644 --- a/drivers/raw/dpaa2_cmdif/meson.build +++ b/drivers/raw/dpaa2_cmdif/meson.build @@ -1,8 +1,6 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright 2018 NXP -build = dpdk_conf.has('RTE_MEMPOOL_DPAA2') -reason = 'missing dependency, DPDK DPAA2 mempool driver' deps += ['rawdev', 'mempool_dpaa2', 'bus_vdev'] sources = files('dpaa2_cmdif.c') diff --git a/drivers/raw/dpaa2_qdma/meson.build b/drivers/raw/dpaa2_qdma/meson.build index 0c9ae0d8dc..4639073bcf 100644 --- a/drivers/raw/dpaa2_qdma/meson.build +++ b/drivers/raw/dpaa2_qdma/meson.build @@ -1,8 +1,6 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright 2018 NXP -build = dpdk_conf.has('RTE_MEMPOOL_DPAA2') -reason = 'missing dependency, DPDK DPAA2 mempool driver' deps += ['rawdev', 'mempool_dpaa2', 'ring', 'kvargs'] sources = files('dpaa2_qdma.c') diff --git a/drivers/vdpa/ifc/meson.build b/drivers/vdpa/ifc/meson.build index 9d256af4b9..f78d36a715 100644 --- a/drivers/vdpa/ifc/meson.build +++ b/drivers/vdpa/ifc/meson.build @@ -1,8 +1,6 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation -build = dpdk_conf.has('RTE_LIB_VHOST') -reason = 'missing dependency, DPDK vhost library' +deps += 'vhost' sources = files('ifcvf_vdpa.c', 'base/ifcvf.c') includes += include_directories('base') -deps += 'vhost' -- 2.23.0