From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 4ECB3A00C2;
Wed, 4 Jan 2023 12:36:54 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 3341040697;
Wed, 4 Jan 2023 12:36:54 +0100 (CET)
Received: from wout5-smtp.messagingengine.com (wout5-smtp.messagingengine.com
[64.147.123.21]) by mails.dpdk.org (Postfix) with ESMTP id A9D494067B
for <dev@dpdk.org>; Wed, 4 Jan 2023 12:36:52 +0100 (CET)
Received: from compute4.internal (compute4.nyi.internal [10.202.2.44])
by mailout.west.internal (Postfix) with ESMTP id 0BA8D320090C;
Wed, 4 Jan 2023 06:36:50 -0500 (EST)
Received: from mailfrontend2 ([10.202.2.163])
by compute4.internal (MEProxy); Wed, 04 Jan 2023 06:36:51 -0500
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
:message-id:mime-version:reply-to:sender:subject:subject:to:to;
s=fm2; t=1672832210; x=1672918610; bh=4631gfhlwA7msykbfqcQ8Hr08
tfON/4lzSoqes9aAFs=; b=wXQtbKoabM0p98BLu2f3+KkXS2zqUZW78GzhktWFr
tQs3IMu4HK5CWUZzQOEKQ5YPDc2b/AZ4LgTYkyRqFFIy9fW2/f78OY8GPiebChL9
907761nZ/+tHTQBbRJaE8ooKwNs5JhvK3xDVSr3vgYadIF4zQ1HPLznxEOnsoQHP
AfAXJXryeKSHAy66Qd2WGyuCCqzost5LdvD0lddWQlMTjt49S3CMn4f9Z062tYz0
W1QNF7c19gAWOr9CMzmgTzhN/aOLBNcR9OQuPL8I2iHF0izohRTlJWhXmzIWIl7z
9ovFbI10wQNatSmqFSf9PNR0lLEPTvnSQF6awGZ6vQmXA==
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:message-id
:mime-version:reply-to:sender:subject:subject:to:to:x-me-proxy
:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=
1672832210; x=1672918610; bh=4631gfhlwA7msykbfqcQ8Hr08tfON/4lzSo
qes9aAFs=; b=Y2amCArj09f+W8D06bky2MLlAe3qVzX7rjzgKA3gDuXF2xol/l3
l4EK5njf9qnUlDsmgwyVS+hpnraLhBRAa2xGKpMQzgOhcmNIp+59UbngU6EyN/r3
q1RIJ4BgJXOzlf1+/du0EqIQmAwK0JT4lnkcWYQMOkYCshk2Adli2uqckuFOMAxr
5Cm3nCkVK23OxF422/Sl7KoikGNf/RJUElt4gLhZADmh3na9eSQ7ZVnEOkmjl7gd
EJ7+QI+9TzC06rohmqlGB4dxyFhzjl8aiaSNYgPa7BpId0jANuFDFjF2IrK64urT
nM0Dvd7Zbe+7DZWkeaXrEkZFyJ3VTNBliXQ==
X-ME-Sender: <xms:0mS1Y-LEvYv9TJv-b-Ux7ECv_1FarC0tRUhAEdb7GEExxzP_gcT9Kw>
<xme:0mS1Y2L8_cLoklklcYDE7j7-C1mAcV11_MCJcdA2LbEZ_nwIWmgWzPGaKp-gJEDA9
0eYxiDfDGZYbAZ9kg>
X-ME-Received: <xmr:0mS1Y-vZnNQWOYnd58Ck-k0CHKqm1wmn9vH4SXfJJ4OxD86do_bxRaoYBXNz-ZIGQInismSi3Pu2GZ03_eQbuuvzuU6jjQE>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrjeeigddvlecutefuodetggdotefrodftvf
curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu
uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc
fjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefvhhhomhgrshcu
ofhonhhjrghlohhnuceothhhohhmrghssehmohhnjhgrlhhonhdrnhgvtheqnecuggftrf
grthhtvghrnhepveevfeevieeihfetudekgeekleeigeffueekveduteeuffeiudevteei
udekfeelnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomh
epthhhohhmrghssehmohhnjhgrlhhonhdrnhgvth
X-ME-Proxy: <xmx:0mS1YzZXGWYQtpDbZ2ksbd-4dOkFogJqT16TMQAf8krDj1N-hHzI4Q>
<xmx:0mS1Y1ZqMLMQ7FCi4DtfjSKru61yW9e8fjk0j_BhQ8kVpyClU_AWWg>
<xmx:0mS1Y_AmVefc7yq274BbI6kj8wum-25dTIim7tZ4hs3_UDDiA2S2_g>
<xmx:0mS1Y5F6gUsjT8EjYiGryM3yqm2wXvzv1QOIen0kBmTM3NruYmZqVA>
Feedback-ID: i47234305:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed,
4 Jan 2023 06:36:49 -0500 (EST)
From: Thomas Monjalon <thomas@monjalon.net>
To: Ruifeng Wang <ruifeng.wang@arm.com>,
Bruce Richardson <bruce.richardson@intel.com>,
Stanislaw Kardach <kda@semihalf.com>
Cc: dev@dpdk.org,
David Marchand <david.marchand@redhat.com>
Subject: [PATCH] build: avoid deprecated function for Meson properties
Date: Wed, 4 Jan 2023 12:36:35 +0100
Message-Id: <20230104113635.206506-1-thomas@monjalon.net>
X-Mailer: git-send-email 2.39.0
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 <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
The function get_cross_property() has been deprecated in Meson 0.58,
and is replaced by the function get_external_property() introduced
in Meson 0.54.
This replacement requires to raise the minimal accepted Meson version
from 0.53.2 to 0.54.0.
Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
config/arm/meson.build | 4 ++--
config/meson.build | 6 +++---
config/riscv/meson.build | 4 ++--
doc/guides/linux_gsg/sys_reqs.rst | 2 +-
drivers/meson.build | 4 ++--
kernel/linux/meson.build | 4 ++--
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/config/arm/meson.build b/config/arm/meson.build
index 6442ec9596..5a9411af75 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -503,7 +503,7 @@ if dpdk_conf.get('RTE_ARCH_32')
dpdk_conf.set('RTE_CACHE_LINE_SIZE', 64)
if meson.is_cross_build()
update_flags = true
- soc = meson.get_cross_property('platform', '')
+ soc = meson.get_external_property('platform', '')
if soc == ''
error('Arm SoC must be specified in the cross file.')
endif
@@ -558,7 +558,7 @@ else
endif
else
# cross build
- soc = meson.get_cross_property('platform', '')
+ soc = meson.get_external_property('platform', '')
if soc == ''
error('Arm SoC must be specified in the cross file.')
endif
diff --git a/config/meson.build b/config/meson.build
index 6d9ffd4f4b..80564eec52 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -176,7 +176,7 @@ endif
# check for libraries used in multiple places in DPDK
has_libnuma = 0
find_libnuma = true
-if meson.is_cross_build() and not meson.get_cross_property('numa', true)
+if meson.is_cross_build() and not meson.get_external_property('numa', true)
# don't look for libnuma if explicitly disabled in cross build
find_libnuma = false
endif
@@ -324,12 +324,12 @@ dpdk_conf.set('RTE_COMPILE_TIME_CPUFLAGS', ','.join(compile_time_cpuflags))
# apply cross-specific options
if meson.is_cross_build()
# configure RTE_MAX_LCORE and RTE_MAX_NUMA_NODES from cross file
- cross_max_lcores = meson.get_cross_property('max_lcores', 0)
+ cross_max_lcores = meson.get_external_property('max_lcores', 0)
if cross_max_lcores != 0
message('Setting RTE_MAX_LCORE from cross file')
dpdk_conf.set('RTE_MAX_LCORE', cross_max_lcores)
endif
- cross_max_numa_nodes = meson.get_cross_property('max_numa_nodes', 0)
+ cross_max_numa_nodes = meson.get_external_property('max_numa_nodes', 0)
if cross_max_numa_nodes != 0
message('Setting RTE_MAX_NUMA_NODES from cross file')
dpdk_conf.set('RTE_MAX_NUMA_NODES', cross_max_numa_nodes)
diff --git a/config/riscv/meson.build b/config/riscv/meson.build
index 07d7d9da23..7562c6cb99 100644
--- a/config/riscv/meson.build
+++ b/config/riscv/meson.build
@@ -84,8 +84,8 @@ if not meson.is_cross_build()
endif
else
# cross build
- vendor_id = meson.get_cross_property('vendor_id')
- arch_id = meson.get_cross_property('arch_id')
+ vendor_id = meson.get_external_property('vendor_id')
+ arch_id = meson.get_external_property('arch_id')
endif
if not vendors.has_key(vendor_id)
diff --git a/doc/guides/linux_gsg/sys_reqs.rst b/doc/guides/linux_gsg/sys_reqs.rst
index a7e8261e22..e4f9b41251 100644
--- a/doc/guides/linux_gsg/sys_reqs.rst
+++ b/doc/guides/linux_gsg/sys_reqs.rst
@@ -43,7 +43,7 @@ Compilation of the DPDK
* Python 3.6 or later.
-* Meson (version 0.53.2+) and ninja
+* Meson (version 0.54+) and ninja
* ``meson`` & ``ninja-build`` packages in most Linux distributions
* If the packaged version is below the minimum version, the latest versions
diff --git a/drivers/meson.build b/drivers/meson.build
index c6d619200f..c17c92cca8 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -25,8 +25,8 @@ subdirs = [
]
if meson.is_cross_build()
- disable_drivers += ',' + meson.get_cross_property('disable_drivers', '')
- enable_drivers += ',' + meson.get_cross_property('enable_drivers', '')
+ disable_drivers += ',' + meson.get_external_property('disable_drivers', '')
+ enable_drivers += ',' + meson.get_external_property('enable_drivers', '')
endif
# add cmdline disabled drivers and meson disabled drivers together
diff --git a/kernel/linux/meson.build b/kernel/linux/meson.build
index 16a0948994..66cbcd1dbf 100644
--- a/kernel/linux/meson.build
+++ b/kernel/linux/meson.build
@@ -67,7 +67,7 @@ elif cross_compiler.endswith('clang')
found_target = false
# search for '-target' and use the arg that follows
# (i.e. the value of '-target') as cross_prefix
- foreach cross_c_arg : meson.get_cross_property('c_args')
+ foreach cross_c_arg : meson.get_external_property('c_args')
if found_target and cross_prefix == ''
cross_prefix = cross_c_arg
endif
@@ -79,7 +79,7 @@ elif cross_compiler.endswith('clang')
error('Did not find -target and its value in c_args in input cross-file.')
endif
linker = 'lld'
- foreach cross_c_link_arg : meson.get_cross_property('c_link_args')
+ foreach cross_c_link_arg : meson.get_external_property('c_link_args')
if cross_c_link_arg.startswith('-fuse-ld')
linker = cross_c_link_arg.split('=')[1]
endif
--
2.39.0