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 8F1D14327C; Fri, 3 Nov 2023 17:28:56 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2768B40263; Fri, 3 Nov 2023 17:28:56 +0100 (CET) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by mails.dpdk.org (Postfix) with ESMTP id 0D8774014F for ; Fri, 3 Nov 2023 17:28:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699028934; x=1730564934; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=JZvdabG34j3zNLn2aDyEp7IOhdcT5NXULN1EScMvWzA=; b=DvNmqRm3TUVF+G3F+GEMNQcjOKSsg+sK1nJnIWOEHteMMz7DaaWd3bMT ENkNcK/HTdx/upcG+U/lpUqYit+iSc+E7bggE6QWGOVS2QH27cROzw6o7 9V+KN3Kzjhb0pIwbfUFiAiQRpf9gxwzzOthnUu9pKVPxtX4YcqCtXJmHB RNTms7RPG091IWph+kzZAmKqnp7p3mV8Ak0OBRLUzordqZb5j7ZKRdnIx 0rKvZjl9StV2wOT7zFE+XB8WAl/28uX/NsrFFT+G4pAJjZSmvT+FJzmjZ 9irIKugaQnGSvFsAAlU5TjsQxLjAZRmoiE6r2/qc7QbfBnJhfa7A4dd0r A==; X-IronPort-AV: E=McAfee;i="6600,9927,10883"; a="10511957" X-IronPort-AV: E=Sophos;i="6.03,273,1694761200"; d="scan'208";a="10511957" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Nov 2023 09:28:53 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10883"; a="878698108" X-IronPort-AV: E=Sophos;i="6.03,273,1694761200"; d="scan'208";a="878698108" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.41]) by fmsmga002.fm.intel.com with ESMTP; 03 Nov 2023 09:28:52 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Subject: [PATCH 24.03] build: track mandatory rather than optional libs Date: Fri, 3 Nov 2023 16:28:30 +0000 Message-Id: <20231103162830.593702-1-bruce.richardson@intel.com> X-Mailer: git-send-email 2.39.2 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 --- lib/meson.build | 70 +++++++++++++++++-------------------------------- 1 file changed, 24 insertions(+), 46 deletions(-) diff --git a/lib/meson.build b/lib/meson.build index 6c143ce5a6..2dd2ee7262 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 = [ + 'log', + 'kvargs', + 'telemetry', + 'eal', + 'ring', + 'rcu', + 'mempool', + 'mbuf', + 'net', + 'meter', + 'ethdev', + 'pci', + 'cmdline', + 'hash', + 'timer', + 'acl', + 'lpm', + 'rib', + 'stack', + 'fib' ] -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