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 97BA1A00C2; Wed, 4 Jan 2023 13:00:18 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8C85940697; Wed, 4 Jan 2023 13:00:18 +0100 (CET) Received: from mail-qk1-f170.google.com (mail-qk1-f170.google.com [209.85.222.170]) by mails.dpdk.org (Postfix) with ESMTP id EBEAA4067B for ; Wed, 4 Jan 2023 13:00:17 +0100 (CET) Received: by mail-qk1-f170.google.com with SMTP id e6so16157930qkl.4 for ; Wed, 04 Jan 2023 04:00:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf.com; s=google; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=XfgAf7uyM9HFrctlg6WJVTRE64asa+gJi6TgZEWbsYA=; b=a52TuSbkQECHp1ae8CoCMniI2TCcaW3B+3niXGIEOBB6+2sRn5dTZWuBSSiLEcWbyH KkI596rOLmCrUi0oIYINSnKxoX55/8uTNHpKsZpMBERSiF5OZcn8+hStfpw5VVU3nTXx e7ZrE3f/k67jH1hhfC+gi5Dh4KpRouhFtq9pFOw3KfUMXRKlpmBLDa4TU2OMhZ+GwXqd Lpu4lSQl8/wjjKLsTXjcvNNYZ6U+SotDRMi/52WGbwiO8lfxAlEFH3gid918UEw5Rfrl KwT3+gU91xKscaEfubxOFeWSWAEKbSp8aXz0ZAksCFraMXUIvkDHoJbkpdz1ZJ9eSJTm uh9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XfgAf7uyM9HFrctlg6WJVTRE64asa+gJi6TgZEWbsYA=; b=rg/eDbwf19VztcdoAgBcELOR68zqzaaAAcOMNfW4YcahtTQxvuBFj8gbhROJ7toL9K XQKkoQ+S8xp3rQlOtvZZmfrPD6C++4mf5IgzkPPAjp8iQGMyGWOD7mhIiuvmwWNw4AOF WRm5B9ZHV+uGX3vrjwscIM5ZqdF0iVN99zFIPuCnDxyl/PRXfTjV3VZA37Yqw/8S3hw2 ysMMAjsgCwh5jgLu0YQYsyPaPLWF7izmDbobWvi7PiCQx8aSJEpvt73u27f4z6VIewNn mCXnk10/CmF/gBCHtt/3LF8G7ZCQgjf3xf47rcwoIm6yVwlb7XHcj61cWuT7G46fGIK/ 4LXg== X-Gm-Message-State: AFqh2koxdFH1r87XZNJB1jIkpOz1qtGofFrMpU0Jum2oJFCtBaSQ0QHh IM8WJ0L5MqEPRa3GeegAKI3CjglRJrV/jewBbb/u8w== X-Google-Smtp-Source: AMrXdXumYAvxOpBN19uOTcPv1IJUZ2QdVbcA3XtqcBHRVbg4Wi/mGqjpLBhFrwWrkUuEZIVHzh/XUycWNN6Of3L0Oag= X-Received: by 2002:a05:620a:1286:b0:702:4f9a:ff11 with SMTP id w6-20020a05620a128600b007024f9aff11mr2523424qki.446.1672833617204; Wed, 04 Jan 2023 04:00:17 -0800 (PST) MIME-Version: 1.0 References: <20230104113635.206506-1-thomas@monjalon.net> In-Reply-To: <20230104113635.206506-1-thomas@monjalon.net> From: =?UTF-8?Q?Stanis=C5=82aw_Kardach?= Date: Wed, 4 Jan 2023 12:59:41 +0100 Message-ID: Subject: Re: [PATCH] build: avoid deprecated function for Meson properties To: Thomas Monjalon Cc: Ruifeng Wang , Bruce Richardson , dev@dpdk.org, David Marchand Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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 On Wed, Jan 4, 2023 at 12:36 PM Thomas Monjalon wrote= : > > 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 > --- > 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 =3D true > - soc =3D meson.get_cross_property('platform', '') > + soc =3D meson.get_external_property('platform', '') > if soc =3D=3D '' > error('Arm SoC must be specified in the cross file.') > endif > @@ -558,7 +558,7 @@ else > endif > else > # cross build > - soc =3D meson.get_cross_property('platform', '') > + soc =3D meson.get_external_property('platform', '') > if soc =3D=3D '' > 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 =3D 0 > find_libnuma =3D 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', tr= ue) > # don't look for libnuma if explicitly disabled in cross build > find_libnuma =3D 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 =3D meson.get_cross_property('max_lcores', 0) > + cross_max_lcores =3D meson.get_external_property('max_lcores', 0) > if cross_max_lcores !=3D 0 > message('Setting RTE_MAX_LCORE from cross file') > dpdk_conf.set('RTE_MAX_LCORE', cross_max_lcores) > endif > - cross_max_numa_nodes =3D meson.get_cross_property('max_numa_nodes', = 0) > + cross_max_numa_nodes =3D meson.get_external_property('max_numa_nodes= ', 0) > if cross_max_numa_nodes !=3D 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 =3D meson.get_cross_property('vendor_id') > - arch_id =3D meson.get_cross_property('arch_id') > + vendor_id =3D meson.get_external_property('vendor_id') > + arch_id =3D 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 v= ersions > 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 =3D [ > ] > > if meson.is_cross_build() > - disable_drivers +=3D ',' + meson.get_cross_property('disable_drivers= ', '') > - enable_drivers +=3D ',' + meson.get_cross_property('enable_drivers',= '') > + disable_drivers +=3D ',' + meson.get_external_property('disable_driv= ers', '') > + enable_drivers +=3D ',' + meson.get_external_property('enable_driver= s', '') > 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 =3D 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 =3D=3D '' > cross_prefix =3D 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 cro= ss-file.') > endif > linker =3D '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 =3D cross_c_link_arg.split('=3D')[1] > endif > -- > 2.39.0 > Reviewed-by: Stanislaw Kardach --=20 Best Regards, Stanis=C5=82aw Kardach