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 6F8084599D; Fri, 20 Sep 2024 14:58:31 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1BCC04344F; Fri, 20 Sep 2024 14:58:09 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) by mails.dpdk.org (Postfix) with ESMTP id 4C9D543437 for ; Fri, 20 Sep 2024 14:58:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1726837088; x=1758373088; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ptwBbSxRk6i3gqBUYCdQaWWQK93rtrL6+384B2w4xGo=; b=CJwBirN5/dAiBA2eVJx/XbNfi4NOBJC4R9wj8AMOlwrc5uKLH2PiOUpA mfHGB1dpopJrcv5nLxqg+mc8VQv2eHeNjuNbbDP4vbiYgT5ZYR6JJul8l GgZZxkeKmhVudNJAIFm4KXvEwlqsXyA9+AgRZbpfVXms+Q6/LxDwIY3G/ 0quZDh/XTB7nbxQ9iIaZaag6kvMKhzdiqddPGwKRSVmx18VdAKp+/4tJq n/bqnVIga0hA1tDZaQ0elqr0ZqQGKq/5UAATIgMiVneB3R3OdG+i4b+Z+ RE5XzlA7Fh8v7qIpXo9uDEQXvadcPGQifGOdVeFLNWVBJzuIqzwp/RAzs w==; X-CSE-ConnectionGUID: 7fX9kYgCSCqr9/b7GsP/HQ== X-CSE-MsgGUID: yOK5jvbRTUKyQlhwnAPTNw== X-IronPort-AV: E=McAfee;i="6700,10204,11200"; a="25991113" X-IronPort-AV: E=Sophos;i="6.10,244,1719903600"; d="scan'208";a="25991113" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Sep 2024 05:58:07 -0700 X-CSE-ConnectionGUID: 5D3pKZ02TjyieZhFmA9YSQ== X-CSE-MsgGUID: RTYjU+e/QQKw/TJARgS6GQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,244,1719903600"; d="scan'208";a="71135921" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by orviesa008.jf.intel.com with ESMTP; 20 Sep 2024 05:58:06 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: mb@smartsharesystems.com, thomas@monjalon.net, david.marchand@redhat.com, Bruce Richardson Subject: [PATCH 5/5] build: replace deprecated meson function Date: Fri, 20 Sep 2024 13:57:37 +0100 Message-ID: <20240920125737.1197969-6-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240920125737.1197969-1-bruce.richardson@intel.com> References: <20240920125737.1197969-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 The meson function "get_cross_property" is deprecated in meson 0.58 and should be replaced by "get_external_property". Signed-off-by: Bruce Richardson --- config/arm/meson.build | 4 ++-- config/meson.build | 6 +++--- config/riscv/meson.build | 4 ++-- drivers/event/cnxk/meson.build | 2 +- drivers/meson.build | 4 ++-- drivers/net/cnxk/meson.build | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/config/arm/meson.build b/config/arm/meson.build index 012935d5d7..6ef91d3a1a 100644 --- a/config/arm/meson.build +++ b/config/arm/meson.build @@ -717,7 +717,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 @@ -772,7 +772,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 913825b1ca..869f7605e8 100644 --- a/config/meson.build +++ b/config/meson.build @@ -227,7 +227,7 @@ endif # check for libraries used in multiple places in DPDK has_libnuma = false 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 @@ -377,12 +377,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/drivers/event/cnxk/meson.build b/drivers/event/cnxk/meson.build index e0e350570d..2c1060ad87 100644 --- a/drivers/event/cnxk/meson.build +++ b/drivers/event/cnxk/meson.build @@ -9,7 +9,7 @@ if not is_linux or not dpdk_conf.get('RTE_ARCH_64') endif if meson.is_cross_build() - soc_type = meson.get_cross_property('platform', '') + soc_type = meson.get_external_property('platform', '') else soc_type = platform endif diff --git a/drivers/meson.build b/drivers/meson.build index 1cb98e9354..2733306698 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -32,8 +32,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/drivers/net/cnxk/meson.build b/drivers/net/cnxk/meson.build index 7bce80098a..4506ce9306 100644 --- a/drivers/net/cnxk/meson.build +++ b/drivers/net/cnxk/meson.build @@ -9,7 +9,7 @@ if not dpdk_conf.get('RTE_ARCH_64') endif if meson.is_cross_build() - soc_type = meson.get_cross_property('platform', '') + soc_type = meson.get_external_property('platform', '') else soc_type = platform endif -- 2.43.0