[5/5] build: replace deprecated meson function

Message ID 20240920125737.1197969-6-bruce.richardson@intel.com (mailing list archive)
State Accepted
Delegated to: David Marchand
Headers
Series Increase minimum meson version |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/loongarch-compilation fail meson build failure
ci/Intel-compilation success Compilation OK
ci/intel-Functional success Functional PASS
ci/github-robot: build success github build: passed
ci/iol-unit-amd64-testing warning Testing issues
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-compile-amd64-testing fail Testing issues
ci/iol-compile-arm64-testing fail Testing issues
ci/iol-unit-arm64-testing warning Testing issues
ci/iol-sample-apps-testing warning Testing issues
ci/intel-Testing success Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-marvell-Functional success Functional Testing PASS

Commit Message

Bruce Richardson Sept. 20, 2024, 12:57 p.m. UTC
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 <bruce.richardson@intel.com>
---
 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(-)
  

Comments

Robin Jarry Oct. 15, 2024, 8:17 a.m. UTC | #1
Bruce Richardson, Sep 20, 2024 at 14:57:
> 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 <bruce.richardson@intel.com>
> ---

Reviewed-by: Robin Jarry <rjarry@redhat.com>
  

Patch

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