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 B4A904327C; Fri, 3 Nov 2023 17:52:33 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A36F3402C7; Fri, 3 Nov 2023 17:52:33 +0100 (CET) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.93]) by mails.dpdk.org (Postfix) with ESMTP id 23A8A4014F for ; Fri, 3 Nov 2023 17:52:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699030352; x=1730566352; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6BHVun2x3dr+e6Qar5fvlvvjlq0bF/APbi4bFd0I0ms=; b=fVeFMC3QZbU4SVo0zy4Ed0slUzjkb7Eg2IXJLBRXvkXTC+NOP3YkzpeN zalJgTGrIagV3aKAxTNYbaCGdRzWOIcBKog1rxnV7x57ZRXAp3BcqlIAs z2vwm95pkrlILgko124+qIkEKRq/kDqf/2PrFbkDwxBFVMCcluVrCtU/c ZeUAxaA0zTP1eGWh0YM1QuuWUlYO5BMa0dv8119Ju89GpjHmKa+6M9W0l f0BkcTm3MejXNfZCXm6oGL0adalmESVnDEQzYjSsE8+yD2LnyWwo0xCX7 XqAvm5AktN6rgmhrvpL2SEtnQviTLeYNIRX8XWPHcXi47hBynT+4bxmlF Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10883"; a="386152494" X-IronPort-AV: E=Sophos;i="6.03,273,1694761200"; d="scan'208";a="386152494" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Nov 2023 09:52:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10883"; a="852319026" X-IronPort-AV: E=Sophos;i="6.03,273,1694761200"; d="scan'208";a="852319026" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.41]) by FMSMGA003.fm.intel.com with ESMTP; 03 Nov 2023 09:52:30 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Subject: [PATCH 24.03 v2] build: track mandatory rather than optional libs Date: Fri, 3 Nov 2023 16:52:08 +0000 Message-Id: <20231103165208.1210182-1-bruce.richardson@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231103162830.593702-1-bruce.richardson@intel.com> References: <20231103162830.593702-1-bruce.richardson@intel.com> 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 DPDK now has more optional libraries than mandatory ones, so invert the list stored in the meson.build file from the optional ones to the "always_enable" ones. As well as being a shorter list: * we can remove the loop building up the "always_enable" list dynamically from the optional list * it better aligns with the drivers/meson.build file which maintains an always_enable list. Signed-off-by: Bruce Richardson --- V2: List of mandatory libraries is now sorted alphabetically --- lib/meson.build | 70 +++++++++++++++++-------------------------------- 1 file changed, 24 insertions(+), 46 deletions(-) diff --git a/lib/meson.build b/lib/meson.build index 6c143ce5a6..8c922d3097 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -75,52 +75,29 @@ if is_ms_compiler ] endif -optional_libs = [ - 'bbdev', - 'bitratestats', - 'bpf', - 'cfgfile', - 'compressdev', - 'cryptodev', - 'dispatcher', - 'distributor', - 'dmadev', - 'efd', - 'eventdev', - 'gpudev', - 'graph', - 'gro', - 'gso', - 'ip_frag', - 'ipsec', - 'jobstats', - 'latencystats', - 'member', - 'metrics', - 'mldev', - 'node', - 'pcapng', - 'pdcp', - 'pdump', - 'pipeline', - 'port', - 'power', - 'rawdev', - 'regexdev', - 'reorder', - 'sched', - 'security', - 'table', - 'vhost', +always_enable = [ + 'acl', + 'cmdline', + 'eal', + 'ethdev', + 'fib', + 'hash', + 'kvargs', + 'log', + 'lpm', + 'mbuf', + 'mempool', + 'meter', + 'net', + 'pci', + 'rcu', + 'rib', + 'ring', + 'stack', + 'telemetry', + 'timer', ] -always_enable = [] -foreach l:libraries - if not optional_libs.contains(l) - always_enable += l - endif -endforeach - enable_deprecated_libs = [] foreach l:run_command(list_dir_globs, get_option('enable_deprecated_libs'), check: true).stdout().split() @@ -136,9 +113,10 @@ enable_libs = run_command(list_dir_globs, get_option('enable_libs'), check: true require_libs = true if enable_libs.length() == 0 require_libs = false - enable_libs += optional_libs + enable_libs = libraries +else + enable_libs += always_enable endif -enable_libs += always_enable default_cflags = machine_args default_cflags += ['-DALLOW_EXPERIMENTAL_API'] -- 2.39.2