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 C783A42D16; Wed, 21 Jun 2023 19:01:23 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BA4E541151; Wed, 21 Jun 2023 19:01:23 +0200 (CEST) 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 1E7C5410FD for ; Wed, 21 Jun 2023 19:01:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687366881; 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: in-reply-to:in-reply-to:references:references; bh=4V84BtOLgiedfTig4+zUYUsMzYbXZp8iMRv/6VTQRH8=; b=d4qsU5P6h5KT69PG6LZBMRVhjwjlTVfHSAr0Bi47O2VPF2qO+Edc7ip0cbqPhVdQrZSafh oFOB5u6HKx7UJjhAMJFNwqBPHVVHjuwLSI4twEm50KptEfhcomozXLhNWpoS5PAwNmGPrZ vkTqdmos58AyyDjNWI/M4/2ua/C3Ppk= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-436-_rjWd5NGOnWmQ4jqOID0Ow-1; Wed, 21 Jun 2023 13:01:17 -0400 X-MC-Unique: _rjWd5NGOnWmQ4jqOID0Ow-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EF03A3C1C4C4; Wed, 21 Jun 2023 17:01:14 +0000 (UTC) Received: from dmarchan.redhat.com (unknown [10.45.224.210]) by smtp.corp.redhat.com (Postfix) with ESMTP id 73E462017DE2; Wed, 21 Jun 2023 17:01:13 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: thomas@monjalon.net, bluca@debian.org, tredaelli@redhat.com, i.maximets@ovn.org, james.r.harris@intel.com, mohammed@hawari.fr, Bruce Richardson Subject: [PATCH v4 2/4] build: rename enabled libraries list Date: Wed, 21 Jun 2023 19:00:56 +0200 Message-Id: <20230621170058.2740340-3-david.marchand@redhat.com> In-Reply-To: <20230621170058.2740340-1-david.marchand@redhat.com> References: <20211117112847.7362-6-david.marchand@redhat.com> <20230621170058.2740340-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 enabled_libs variable is renamed and moved to the top level meson.build file, for sake of consistency wrt to drivers and applications similar variables. Signed-off-by: David Marchand --- app/test/meson.build | 2 +- buildtools/chkincs/meson.build | 2 +- lib/meson.build | 4 +--- meson.build | 3 ++- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/test/meson.build b/app/test/meson.build index d0fabcbb8b..f3217ae577 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -152,7 +152,7 @@ test_sources = files( 'virtual_pmd.c', ) -test_deps = enabled_libs +test_deps = dpdk_libs_enabled # as well as libs, the pci and vdev bus drivers are needed for a lot of tests test_deps += ['bus_pci', 'bus_vdev'] diff --git a/buildtools/chkincs/meson.build b/buildtools/chkincs/meson.build index 378c2f19ef..f2dadcae18 100644 --- a/buildtools/chkincs/meson.build +++ b/buildtools/chkincs/meson.build @@ -22,7 +22,7 @@ sources += gen_c_files.process(dpdk_chkinc_headers) # so we always include them in deps list deps = [get_variable('shared_rte_bus_vdev'), get_variable('shared_rte_bus_pci')] # add the rest of the libs to the dependencies -foreach l:enabled_libs +foreach l:dpdk_libs_enabled deps += get_variable('shared_rte_' + l) endforeach diff --git a/lib/meson.build b/lib/meson.build index f5c8a70a1d..363a4fd79f 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -112,8 +112,6 @@ if cc.has_argument('-Wno-format-truncation') default_cflags += '-Wno-format-truncation' endif -enabled_libs = [] # used to print summary at the end - foreach l:libraries build = true reason = '' # set if build == false to explain why @@ -180,7 +178,7 @@ foreach l:libraries continue endif - enabled_libs += name + dpdk_libs_enabled += name dpdk_conf.set('RTE_LIB_' + name.to_upper(), 1) install_headers(headers) install_headers(indirect_headers) diff --git a/meson.build b/meson.build index 992ca91e88..39cb73846d 100644 --- a/meson.build +++ b/meson.build @@ -44,6 +44,7 @@ dpdk_extra_ldflags = [] dpdk_libs_deprecated = [] dpdk_apps_disabled = [] dpdk_libs_disabled = [] +dpdk_libs_enabled = [] dpdk_drvs_disabled = [] testpmd_drivers_sources = [] testpmd_drivers_deps = [] @@ -134,7 +135,7 @@ message(output_message + '\n') output_message = '\n=================\nLibraries Enabled\n=================\n' output_message += '\nlibs:\n\t' output_count = 0 -foreach lib:enabled_libs +foreach lib:dpdk_libs_enabled output_message += lib + ', ' output_count += 1 if output_count == 8 -- 2.40.1