* [PATCH 0/5] Increase minimum meson version
@ 2024-09-20 12:57 Bruce Richardson
2024-09-20 12:57 ` [PATCH 1/5] build: increase minimum meson version to 0.57 Bruce Richardson
` (9 more replies)
0 siblings, 10 replies; 27+ messages in thread
From: Bruce Richardson @ 2024-09-20 12:57 UTC (permalink / raw)
To: dev; +Cc: mb, thomas, david.marchand, Bruce Richardson
This patchset proposed increasing the minimum meson version to 0.57
and makes changes to update our build files appropriately for that
change: replacing deprecated functions, removing unnecessary version
checks and taking advantage of some new capabilities.
Why 0.57? No one particular reason; it's mainly a conservative version
bump that doesn't have many impacts, but still gives us the minimum
updates we need to replace the deprecated get_cross_properties fn
and have a few extra features guaranteed available.
Bruce Richardson (5):
build: increase minimum meson version to 0.57
build: remove version check on compiler links function
build: remove unnecessary version checks
build: use version file support from meson
build: replace deprecated meson function
.ci/linux-setup.sh | 2 +-
config/arm/meson.build | 4 ++--
config/meson.build | 8 ++++----
config/riscv/meson.build | 4 ++--
doc/api/meson.build | 2 +-
doc/guides/linux_gsg/sys_reqs.rst | 2 +-
doc/guides/prog_guide/build-sdk-meson.rst | 2 +-
drivers/common/qat/meson.build | 2 +-
drivers/crypto/ipsec_mb/meson.build | 2 +-
drivers/event/cnxk/meson.build | 2 +-
drivers/meson.build | 7 ++-----
drivers/net/cnxk/meson.build | 2 +-
lib/meson.build | 6 ------
meson.build | 7 ++-----
14 files changed, 20 insertions(+), 32 deletions(-)
--
2.43.0
^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH 1/5] build: increase minimum meson version to 0.57
2024-09-20 12:57 [PATCH 0/5] Increase minimum meson version Bruce Richardson
@ 2024-09-20 12:57 ` Bruce Richardson
2024-10-15 8:16 ` Robin Jarry
2024-09-20 12:57 ` [PATCH 2/5] build: remove version check on compiler links function Bruce Richardson
` (8 subsequent siblings)
9 siblings, 1 reply; 27+ messages in thread
From: Bruce Richardson @ 2024-09-20 12:57 UTC (permalink / raw)
To: dev; +Cc: mb, thomas, david.marchand, Bruce Richardson
In order to work around some deprecated functions in meson, we need to
increase meson version. Increasing to 0.57 to also gain support for
other useful features for us in DPDK. Changes of interest to DPDK
include:
* Use get_external_property instead of get_cross_property
* Ability to use a VERSION file rather than hacking it with scripting
* Ability to set built-in options in cross-build files
* Ability to set pkg_config_libdir in cross-build files
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
.ci/linux-setup.sh | 2 +-
doc/guides/linux_gsg/sys_reqs.rst | 2 +-
doc/guides/prog_guide/build-sdk-meson.rst | 2 +-
meson.build | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.ci/linux-setup.sh b/.ci/linux-setup.sh
index 975bf32144..8512a92b21 100755
--- a/.ci/linux-setup.sh
+++ b/.ci/linux-setup.sh
@@ -4,7 +4,7 @@
[ "$(id -u)" != '0' ] || alias sudo=
# need to install as 'root' since some of the unit tests won't run without it
-sudo python3 -m pip install --upgrade 'meson==0.53.2'
+sudo python3 -m pip install --upgrade 'meson==0.57.0'
# setup hugepages. error ignored because having hugepage is not mandatory.
cat /proc/meminfo
diff --git a/doc/guides/linux_gsg/sys_reqs.rst b/doc/guides/linux_gsg/sys_reqs.rst
index 9c5282573e..13d632cec7 100644
--- a/doc/guides/linux_gsg/sys_reqs.rst
+++ b/doc/guides/linux_gsg/sys_reqs.rst
@@ -44,7 +44,7 @@ Compilation of the DPDK
* Python 3.6 or later.
-* Meson (version 0.53.2+) and ninja
+* Meson (version 0.57+) 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/doc/guides/prog_guide/build-sdk-meson.rst b/doc/guides/prog_guide/build-sdk-meson.rst
index 93aa1f80e3..fdb5d484fa 100644
--- a/doc/guides/prog_guide/build-sdk-meson.rst
+++ b/doc/guides/prog_guide/build-sdk-meson.rst
@@ -35,7 +35,7 @@ The ``meson`` tool is used to configure a DPDK build. On most Linux
distributions this can be got using the local package management system,
e.g. ``dnf install meson`` or ``apt-get install meson``. If meson is not
available as a suitable package, it can also be installed using the Python
-3 ``pip`` tool, e.g. ``pip3 install meson``. Version 0.53.2 or later of meson is
+3 ``pip`` tool, e.g. ``pip3 install meson``. Version 0.57 or later of meson is
required - if the version packaged is too old, the latest version is
generally available from "pip".
diff --git a/meson.build b/meson.build
index 8b248d4505..69888834b4 100644
--- a/meson.build
+++ b/meson.build
@@ -13,7 +13,7 @@ project('DPDK', 'c',
'default_library=static',
'warning_level=2',
],
- meson_version: '>= 0.53.2'
+ meson_version: '>= 0.57'
)
# check for developer mode
--
2.43.0
^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH 2/5] build: remove version check on compiler links function
2024-09-20 12:57 [PATCH 0/5] Increase minimum meson version Bruce Richardson
2024-09-20 12:57 ` [PATCH 1/5] build: increase minimum meson version to 0.57 Bruce Richardson
@ 2024-09-20 12:57 ` Bruce Richardson
2024-10-15 8:16 ` Robin Jarry
2024-09-20 12:57 ` [PATCH 3/5] build: remove unnecessary version checks Bruce Richardson
` (7 subsequent siblings)
9 siblings, 1 reply; 27+ messages in thread
From: Bruce Richardson @ 2024-09-20 12:57 UTC (permalink / raw)
To: dev; +Cc: mb, thomas, david.marchand, Bruce Richardson, stable
The "compiler.links()" function meson documentation [1] is a little
unclear, in a casual reading implies that the function was new in 0.60
meson release. In fact, it is only enhanced as described in that
release, but is present earlier.
As such, we can remove the version checks preceeding the calls to links
function in our code.
[1] https://mesonbuild.com/Reference-manual_returned_compiler.html#compilerlinks
Fixes: fd809737cf8c ("common/qat: fix build with incompatible IPsec library")
Fixes: fb94d8243894 ("crypto/ipsec_mb: add dependency check for cross build")
Cc: stable@dpdk.org
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
drivers/common/qat/meson.build | 2 +-
drivers/crypto/ipsec_mb/meson.build | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/common/qat/meson.build b/drivers/common/qat/meson.build
index 3893b127dd..5a8de16fe0 100644
--- a/drivers/common/qat/meson.build
+++ b/drivers/common/qat/meson.build
@@ -43,7 +43,7 @@ else
IMB_required_ver = '1.4.0'
IMB_header = '#include<intel-ipsec-mb.h>'
libipsecmb = cc.find_library('IPSec_MB', required: false)
- if libipsecmb.found() and meson.version().version_compare('>=0.60') and cc.links(
+ if libipsecmb.found() and cc.links(
'int main(void) {return 0;}', dependencies: libipsecmb)
# version comes with quotes, so we split based on " and take the middle
imb_ver = cc.get_define('IMB_VERSION_STR',
diff --git a/drivers/crypto/ipsec_mb/meson.build b/drivers/crypto/ipsec_mb/meson.build
index 87bf965554..81631d3050 100644
--- a/drivers/crypto/ipsec_mb/meson.build
+++ b/drivers/crypto/ipsec_mb/meson.build
@@ -17,7 +17,7 @@ if not lib.found()
build = false
reason = 'missing dependency, "libIPSec_MB"'
# if the lib is found, check it's the right format
-elif meson.version().version_compare('>=0.60') and not cc.links(
+elif not cc.links(
'int main(void) {return 0;}', dependencies: lib)
build = false
reason = 'incompatible dependency, "libIPSec_MB"'
--
2.43.0
^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH 3/5] build: remove unnecessary version checks
2024-09-20 12:57 [PATCH 0/5] Increase minimum meson version Bruce Richardson
2024-09-20 12:57 ` [PATCH 1/5] build: increase minimum meson version to 0.57 Bruce Richardson
2024-09-20 12:57 ` [PATCH 2/5] build: remove version check on compiler links function Bruce Richardson
@ 2024-09-20 12:57 ` Bruce Richardson
2024-10-08 8:33 ` David Marchand
2024-10-15 8:17 ` Robin Jarry
2024-09-20 12:57 ` [PATCH 4/5] build: use version file support from meson Bruce Richardson
` (6 subsequent siblings)
9 siblings, 2 replies; 27+ messages in thread
From: Bruce Richardson @ 2024-09-20 12:57 UTC (permalink / raw)
To: dev; +Cc: mb, thomas, david.marchand, Bruce Richardson
Since minimum meson version is now 0.57 we can remove all version checks
for versions lower than that.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
config/meson.build | 2 +-
doc/api/meson.build | 2 +-
drivers/meson.build | 3 ---
lib/meson.build | 6 ------
4 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/config/meson.build b/config/meson.build
index 8c8b019c25..913825b1ca 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -97,7 +97,7 @@ eal_pmd_path = join_paths(get_option('prefix'), driver_install_path)
if not is_windows
meson.add_install_script('../buildtools/symlink-drivers-solibs.sh',
get_option('libdir'), pmd_subdir_opt)
-elif meson.version().version_compare('>=0.55.0')
+else
# 0.55.0 is required to use external program with add_install_script
meson.add_install_script(py3,
files('../buildtools/symlink-drivers-solibs.py'),
diff --git a/doc/api/meson.build b/doc/api/meson.build
index 5b50692df9..404c145672 100644
--- a/doc/api/meson.build
+++ b/doc/api/meson.build
@@ -97,6 +97,6 @@ doc_target_names += 'Doxygen_API(Manpage)'
# refresh the manpage database on install
# if DPDK manpages are installed to a staging directory, not in MANPATH, this has no effect
mandb = find_program('mandb', required: false)
-if mandb.found() and get_option('enable_docs') and meson.version().version_compare('>=0.55.0')
+if mandb.found() and get_option('enable_docs')
meson.add_install_script(mandb)
endif
diff --git a/drivers/meson.build b/drivers/meson.build
index 66931d4241..1cb98e9354 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -280,9 +280,6 @@ foreach subpath:subdirs
lk_deps += [def_file]
lk_args = ['-Wl,/def:' + def_file.full_path()]
- if meson.version().version_compare('<0.54.0')
- lk_args += ['-Wl,/implib:drivers\\lib' + lib_name + '.dll.a']
- endif
else
mingw_map = custom_target(lib_name + '_mingw',
command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'],
diff --git a/lib/meson.build b/lib/meson.build
index 162287753f..ce92cb5537 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -276,14 +276,8 @@ foreach l:libraries
if is_ms_compiler
lk_args = ['/def:' + def_file.full_path()]
- if meson.version().version_compare('<0.54.0')
- lk_args += ['/implib:lib\\librte_' + l + '.dll.a']
- endif
else
lk_args = ['-Wl,/def:' + def_file.full_path()]
- if meson.version().version_compare('<0.54.0')
- lk_args += ['-Wl,/implib:lib\\librte_' + l + '.dll.a']
- endif
endif
else
if is_windows
--
2.43.0
^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH 4/5] build: use version file support from meson
2024-09-20 12:57 [PATCH 0/5] Increase minimum meson version Bruce Richardson
` (2 preceding siblings ...)
2024-09-20 12:57 ` [PATCH 3/5] build: remove unnecessary version checks Bruce Richardson
@ 2024-09-20 12:57 ` Bruce Richardson
2024-10-15 8:17 ` Robin Jarry
2024-09-20 12:57 ` [PATCH 5/5] build: replace deprecated meson function Bruce Richardson
` (5 subsequent siblings)
9 siblings, 1 reply; 27+ messages in thread
From: Bruce Richardson @ 2024-09-20 12:57 UTC (permalink / raw)
To: dev; +Cc: mb, thomas, david.marchand, Bruce Richardson
Rather than having to use run_command to shell out and read the VERSION
file for the DPDK version, we can use the support added directly to
meson in version 0.57.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
meson.build | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/meson.build b/meson.build
index 69888834b4..fe9040369a 100644
--- a/meson.build
+++ b/meson.build
@@ -2,10 +2,7 @@
# Copyright(c) 2017-2019 Intel Corporation
project('DPDK', 'c',
- # Get version number from file.
- # Fallback to "more" for Windows compatibility.
- version: run_command(find_program('cat', 'more'),
- files('VERSION'), check: true).stdout().strip(),
+ version: files('VERSION'),
license: 'BSD',
default_options: [
'buildtype=release',
--
2.43.0
^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH 5/5] build: replace deprecated meson function
2024-09-20 12:57 [PATCH 0/5] Increase minimum meson version Bruce Richardson
` (3 preceding siblings ...)
2024-09-20 12:57 ` [PATCH 4/5] build: use version file support from meson Bruce Richardson
@ 2024-09-20 12:57 ` Bruce Richardson
2024-10-15 8:17 ` Robin Jarry
2024-09-21 23:21 ` [PATCH 0/5] Increase minimum meson version Ferruh Yigit
` (4 subsequent siblings)
9 siblings, 1 reply; 27+ messages in thread
From: Bruce Richardson @ 2024-09-20 12:57 UTC (permalink / raw)
To: dev; +Cc: mb, thomas, david.marchand, Bruce Richardson
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(-)
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
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH 0/5] Increase minimum meson version
2024-09-20 12:57 [PATCH 0/5] Increase minimum meson version Bruce Richardson
` (4 preceding siblings ...)
2024-09-20 12:57 ` [PATCH 5/5] build: replace deprecated meson function Bruce Richardson
@ 2024-09-21 23:21 ` Ferruh Yigit
2024-09-23 1:59 ` fengchengwen
` (3 subsequent siblings)
9 siblings, 0 replies; 27+ messages in thread
From: Ferruh Yigit @ 2024-09-21 23:21 UTC (permalink / raw)
To: Bruce Richardson, dev; +Cc: mb, thomas, david.marchand
On 9/20/2024 1:57 PM, Bruce Richardson wrote:
> This patchset proposed increasing the minimum meson version to 0.57
> and makes changes to update our build files appropriately for that
> change: replacing deprecated functions, removing unnecessary version
> checks and taking advantage of some new capabilities.
>
> Why 0.57? No one particular reason; it's mainly a conservative version
> bump that doesn't have many impacts, but still gives us the minimum
> updates we need to replace the deprecated get_cross_properties fn
> and have a few extra features guaranteed available.
>
> Bruce Richardson (5):
> build: increase minimum meson version to 0.57
> build: remove version check on compiler links function
> build: remove unnecessary version checks
> build: use version file support from meson
> build: replace deprecated meson function
>
Tested-by: Ferruh Yigit <ferruh.yigit@amd.com>
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH 0/5] Increase minimum meson version
2024-09-20 12:57 [PATCH 0/5] Increase minimum meson version Bruce Richardson
` (5 preceding siblings ...)
2024-09-21 23:21 ` [PATCH 0/5] Increase minimum meson version Ferruh Yigit
@ 2024-09-23 1:59 ` fengchengwen
2024-09-23 2:19 ` fengchengwen
2024-09-30 20:55 ` Tyler Retzlaff
` (2 subsequent siblings)
9 siblings, 1 reply; 27+ messages in thread
From: fengchengwen @ 2024-09-23 1:59 UTC (permalink / raw)
To: Bruce Richardson, dev; +Cc: mb, thomas, david.marchand
Acked-by: Chengwen Feng <fengchengwen@huawei.com>
On 2024/9/20 20:57, Bruce Richardson wrote:
> This patchset proposed increasing the minimum meson version to 0.57
> and makes changes to update our build files appropriately for that
> change: replacing deprecated functions, removing unnecessary version
> checks and taking advantage of some new capabilities.
>
> Why 0.57? No one particular reason; it's mainly a conservative version
> bump that doesn't have many impacts, but still gives us the minimum
> updates we need to replace the deprecated get_cross_properties fn
> and have a few extra features guaranteed available.
>
> Bruce Richardson (5):
> build: increase minimum meson version to 0.57
> build: remove version check on compiler links function
> build: remove unnecessary version checks
> build: use version file support from meson
> build: replace deprecated meson function
>
> .ci/linux-setup.sh | 2 +-
> config/arm/meson.build | 4 ++--
> config/meson.build | 8 ++++----
> config/riscv/meson.build | 4 ++--
> doc/api/meson.build | 2 +-
> doc/guides/linux_gsg/sys_reqs.rst | 2 +-
> doc/guides/prog_guide/build-sdk-meson.rst | 2 +-
> drivers/common/qat/meson.build | 2 +-
> drivers/crypto/ipsec_mb/meson.build | 2 +-
> drivers/event/cnxk/meson.build | 2 +-
> drivers/meson.build | 7 ++-----
> drivers/net/cnxk/meson.build | 2 +-
> lib/meson.build | 6 ------
> meson.build | 7 ++-----
> 14 files changed, 20 insertions(+), 32 deletions(-)
>
> --
> 2.43.0
>
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH 0/5] Increase minimum meson version
2024-09-23 1:59 ` fengchengwen
@ 2024-09-23 2:19 ` fengchengwen
0 siblings, 0 replies; 27+ messages in thread
From: fengchengwen @ 2024-09-23 2:19 UTC (permalink / raw)
To: Bruce Richardson, dev; +Cc: mb, thomas, david.marchand
It should be series-ack,
Series-acked-by: Chengwen Feng <fengchengwen@huawei.com>
On 2024/9/23 9:59, fengchengwen wrote:
> Acked-by: Chengwen Feng <fengchengwen@huawei.com>
>
> On 2024/9/20 20:57, Bruce Richardson wrote:
>> This patchset proposed increasing the minimum meson version to 0.57
>> and makes changes to update our build files appropriately for that
>> change: replacing deprecated functions, removing unnecessary version
>> checks and taking advantage of some new capabilities.
>>
>> Why 0.57? No one particular reason; it's mainly a conservative version
>> bump that doesn't have many impacts, but still gives us the minimum
>> updates we need to replace the deprecated get_cross_properties fn
>> and have a few extra features guaranteed available.
>>
>> Bruce Richardson (5):
>> build: increase minimum meson version to 0.57
>> build: remove version check on compiler links function
>> build: remove unnecessary version checks
>> build: use version file support from meson
>> build: replace deprecated meson function
>>
>> .ci/linux-setup.sh | 2 +-
>> config/arm/meson.build | 4 ++--
>> config/meson.build | 8 ++++----
>> config/riscv/meson.build | 4 ++--
>> doc/api/meson.build | 2 +-
>> doc/guides/linux_gsg/sys_reqs.rst | 2 +-
>> doc/guides/prog_guide/build-sdk-meson.rst | 2 +-
>> drivers/common/qat/meson.build | 2 +-
>> drivers/crypto/ipsec_mb/meson.build | 2 +-
>> drivers/event/cnxk/meson.build | 2 +-
>> drivers/meson.build | 7 ++-----
>> drivers/net/cnxk/meson.build | 2 +-
>> lib/meson.build | 6 ------
>> meson.build | 7 ++-----
>> 14 files changed, 20 insertions(+), 32 deletions(-)
>>
>> --
>> 2.43.0
>>
>
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH 0/5] Increase minimum meson version
2024-09-20 12:57 [PATCH 0/5] Increase minimum meson version Bruce Richardson
` (6 preceding siblings ...)
2024-09-23 1:59 ` fengchengwen
@ 2024-09-30 20:55 ` Tyler Retzlaff
2024-10-08 8:28 ` David Marchand
2024-10-17 7:53 ` David Marchand
9 siblings, 0 replies; 27+ messages in thread
From: Tyler Retzlaff @ 2024-09-30 20:55 UTC (permalink / raw)
To: Bruce Richardson; +Cc: dev, mb, thomas, david.marchand
On Fri, Sep 20, 2024 at 01:57:32PM +0100, Bruce Richardson wrote:
> This patchset proposed increasing the minimum meson version to 0.57
> and makes changes to update our build files appropriately for that
> change: replacing deprecated functions, removing unnecessary version
> checks and taking advantage of some new capabilities.
>
> Why 0.57? No one particular reason; it's mainly a conservative version
> bump that doesn't have many impacts, but still gives us the minimum
> updates we need to replace the deprecated get_cross_properties fn
> and have a few extra features guaranteed available.
>
> Bruce Richardson (5):
> build: increase minimum meson version to 0.57
> build: remove version check on compiler links function
> build: remove unnecessary version checks
> build: use version file support from meson
> build: replace deprecated meson function
>
> .ci/linux-setup.sh | 2 +-
> config/arm/meson.build | 4 ++--
> config/meson.build | 8 ++++----
> config/riscv/meson.build | 4 ++--
> doc/api/meson.build | 2 +-
> doc/guides/linux_gsg/sys_reqs.rst | 2 +-
> doc/guides/prog_guide/build-sdk-meson.rst | 2 +-
> drivers/common/qat/meson.build | 2 +-
> drivers/crypto/ipsec_mb/meson.build | 2 +-
> drivers/event/cnxk/meson.build | 2 +-
> drivers/meson.build | 7 ++-----
> drivers/net/cnxk/meson.build | 2 +-
> lib/meson.build | 6 ------
> meson.build | 7 ++-----
> 14 files changed, 20 insertions(+), 32 deletions(-)
>
> --
Series-acked-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH 0/5] Increase minimum meson version
2024-09-20 12:57 [PATCH 0/5] Increase minimum meson version Bruce Richardson
` (7 preceding siblings ...)
2024-09-30 20:55 ` Tyler Retzlaff
@ 2024-10-08 8:28 ` David Marchand
2024-10-08 19:49 ` [OS-Team] [dpdklab] " Patrick Robb
2024-10-09 1:04 ` zhoumin
2024-10-17 7:53 ` David Marchand
9 siblings, 2 replies; 27+ messages in thread
From: David Marchand @ 2024-10-08 8:28 UTC (permalink / raw)
To: dpdklab, Min Zhou; +Cc: dev, mb, thomas, ci, Bruce Richardson
Hello CI guys,
On Fri, Sep 20, 2024 at 2:57 PM Bruce Richardson
<bruce.richardson@intel.com> wrote:
>
> This patchset proposed increasing the minimum meson version to 0.57
> and makes changes to update our build files appropriately for that
> change: replacing deprecated functions, removing unnecessary version
> checks and taking advantage of some new capabilities.
>
> Why 0.57? No one particular reason; it's mainly a conservative version
> bump that doesn't have many impacts, but still gives us the minimum
> updates we need to replace the deprecated get_cross_properties fn
> and have a few extra features guaranteed available.
>
> Bruce Richardson (5):
> build: increase minimum meson version to 0.57
> build: remove version check on compiler links function
> build: remove unnecessary version checks
> build: use version file support from meson
> build: replace deprecated meson function
>
> .ci/linux-setup.sh | 2 +-
> config/arm/meson.build | 4 ++--
> config/meson.build | 8 ++++----
> config/riscv/meson.build | 4 ++--
> doc/api/meson.build | 2 +-
> doc/guides/linux_gsg/sys_reqs.rst | 2 +-
> doc/guides/prog_guide/build-sdk-meson.rst | 2 +-
> drivers/common/qat/meson.build | 2 +-
> drivers/crypto/ipsec_mb/meson.build | 2 +-
> drivers/event/cnxk/meson.build | 2 +-
> drivers/meson.build | 7 ++-----
> drivers/net/cnxk/meson.build | 2 +-
> lib/meson.build | 6 ------
> meson.build | 7 ++-----
> 14 files changed, 20 insertions(+), 32 deletions(-)
This series can't be merged until the (UNH and LoongArch) CI are ready
for such a change.
TL;DR: the meson minimum version is being changed from 0.53.2 to 0.57
in the current release.
@UNH @Min Zhou
How long would it take for all CI to be ready for this change?
Important note: if relevant to your CI, testing against LTS branches
must still be done with the 0.53.2 version, so no change relying on
post 0.53.2 meson feature gets backported.
--
David Marchand
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH 3/5] build: remove unnecessary version checks
2024-09-20 12:57 ` [PATCH 3/5] build: remove unnecessary version checks Bruce Richardson
@ 2024-10-08 8:33 ` David Marchand
2024-10-15 8:17 ` Robin Jarry
1 sibling, 0 replies; 27+ messages in thread
From: David Marchand @ 2024-10-08 8:33 UTC (permalink / raw)
To: Bruce Richardson; +Cc: dev, mb, thomas
On Fri, Sep 20, 2024 at 2:58 PM Bruce Richardson
<bruce.richardson@intel.com> wrote:
>
> Since minimum meson version is now 0.57 we can remove all version checks
> for versions lower than that.
>
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
> config/meson.build | 2 +-
> doc/api/meson.build | 2 +-
> drivers/meson.build | 3 ---
> lib/meson.build | 6 ------
> 4 files changed, 2 insertions(+), 11 deletions(-)
>
> diff --git a/config/meson.build b/config/meson.build
> index 8c8b019c25..913825b1ca 100644
> --- a/config/meson.build
> +++ b/config/meson.build
> @@ -97,7 +97,7 @@ eal_pmd_path = join_paths(get_option('prefix'), driver_install_path)
> if not is_windows
> meson.add_install_script('../buildtools/symlink-drivers-solibs.sh',
> get_option('libdir'), pmd_subdir_opt)
> -elif meson.version().version_compare('>=0.55.0')
> +else
> # 0.55.0 is required to use external program with add_install_script
Nit: this comment can be removed (I intend to do when applying).
> meson.add_install_script(py3,
> files('../buildtools/symlink-drivers-solibs.py'),
--
David Marchand
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [OS-Team] [dpdklab] Re: [PATCH 0/5] Increase minimum meson version
2024-10-08 8:28 ` David Marchand
@ 2024-10-08 19:49 ` Patrick Robb
2024-10-08 20:04 ` Bruce Richardson
2024-10-09 1:04 ` zhoumin
1 sibling, 1 reply; 27+ messages in thread
From: Patrick Robb @ 2024-10-08 19:49 UTC (permalink / raw)
To: David Marchand
Cc: dpdklab, Min Zhou, dev, mb, thomas, ci, Bruce Richardson,
Puttaswamy, Rajesh T, Cody Cheng, Adam Hassick
[-- Attachment #1: Type: text/plain, Size: 3253 bytes --]
On Tue, Oct 8, 2024 at 4:28 AM David Marchand <david.marchand@redhat.com>
wrote:
>
> This series can't be merged until the (UNH and LoongArch) CI are ready
> for such a change.
>
> TL;DR: the meson minimum version is being changed from 0.53.2 to 0.57
> in the current release.
>
> @UNH @Min Zhou
> How long would it take for all CI to be ready for this change?
>
>
Thanks for the heads up. So, as far as I can tell, this will require an
update to the dpdk/.ci/linux-setup.sh script (which I have just submitted)
as I think various labs rely on it including the github robot, loongson,
Intel (Maybe, I don't know). UNH does not use it much as we opt to meet the
meson dependency separately in the dpdk-ci project's container template
engine.
It will also require updates to the container template engine, which I can
get Cody started on tomorrow.
> Important note: if relevant to your CI, testing against LTS branches
> must still be done with the 0.53.2 version, so no change relying on
> post 0.53.2 meson feature gets backported.
>
Okay, full disclosure I don't think this is something we handled the last
time the meson version got bumped in 2022. So, back then we just bumped the
meson version for all environments to .53, then did LTS testing for 19.11,
20.11, 21.11 from environments running meson .53. But, I understand how
this is an issue and something we should avoid this go around.
However, it is not ideal to set the meson version "at runtime" for CI
testing based on the repo under test (mainline and next-* want .57, old LTS
versions want .53). It would be possible to modify our jenkinsfiles
(automation scripts) to check the DPDK version, and run pip commands
resetting the meson version accordingly, at the start of each testing
job... but I have a couple concerns here with regards to
stability/maintenance.
Another option, which Adam is suggesting, is to create a dedicated
environment which is version locked to .53 (it can just be an ubuntu
container image), label it as a meson .53 environment, and add that to the
total list of dpdk build environments which are run when we do testing for
either 22.11, or 23.11. Then, we could run the rest of the testing from the
same container images we use for mainline (that have .57 baked in), and
this would not be a problem because we would have that 1 environment doing
a dpdk build, which is guaranteed to be on .53. Bruce/David let me know if
you can think of any issues with this.
This is also very similar to a Community Lab request from a few months ago
(which we have an open internal Jira ticket for), which is to add a VM
environment which is locked to the minimum supported kernel version for
DPDK. But, that's another story...
Anyways, in terms of the timeline... the Jenkins script updates are
probably the most difficult in that they will require a PR review, dry run
tests etc. but it's still fairly trivial. Cody can probably update the
meson dependencies on the template engine and submit that to the dpdk-ci
project by end of week. So, I would say CI should be ready by next Tuesday,
provided the patches which will be incoming to dev and ci mailing lists can
be merged. Is this timeline okay?
[-- Attachment #2: Type: text/html, Size: 3905 bytes --]
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [OS-Team] [dpdklab] Re: [PATCH 0/5] Increase minimum meson version
2024-10-08 19:49 ` [OS-Team] [dpdklab] " Patrick Robb
@ 2024-10-08 20:04 ` Bruce Richardson
2024-10-09 14:27 ` Patrick Robb
0 siblings, 1 reply; 27+ messages in thread
From: Bruce Richardson @ 2024-10-08 20:04 UTC (permalink / raw)
To: Patrick Robb
Cc: David Marchand, dpdklab, Min Zhou, dev, mb, thomas, ci,
Puttaswamy, Rajesh T, Cody Cheng, Adam Hassick
On Tue, Oct 08, 2024 at 03:49:12PM -0400, Patrick Robb wrote:
> On Tue, Oct 8, 2024 at 4:28 AM David Marchand
> <[1]david.marchand@redhat.com> wrote:
>
> This series can't be merged until the (UNH and LoongArch) CI are
> ready
> for such a change.
> TL;DR: the meson minimum version is being changed from 0.53.2 to
> 0.57
> in the current release.
> @UNH @Min Zhou
> How long would it take for all CI to be ready for this change?
>
> Thanks for the heads up. So, as far as I can tell, this will require an
> update to the dpdk/.ci/linux-setup.sh script (which I have just
> submitted) as I think various labs rely on it including the github
> robot, loongson, Intel (Maybe, I don't know).
The update to that linux-setup file is included already in the first patch
of the series. No additional updates needed for jobs that rely on it.
> UNH does not use it much
> as we opt to meet the meson dependency separately in the dpdk-ci
> project's container template engine.
That's a bit of a pity, since we can't update the meson version
automatically as part of the meson update as we do with CIs using the
linux-setup script. Is there some other file that can be in the DPDK main
repo that can contain this details to regular DPDK patches can update the
CI too as part of a meson update?
> It will also require updates to the container template engine, which I
> can get Cody started on tomorrow.
>
> Important note: if relevant to your CI, testing against LTS branches
> must still be done with the 0.53.2 version, so no change relying on
> post 0.53.2 meson feature gets backported.
>
> Okay, full disclosure I don't think this is something we handled the
> last time the meson version got bumped in 2022. So, back then we just
> bumped the meson version for all environments to .53, then did LTS
> testing for 19.11, 20.11, 21.11 from environments running meson .53.
> But, I understand how this is an issue and something we should avoid
> this go around.
> However, it is not ideal to set the meson version "at runtime" for CI
> testing based on the repo under test (mainline and next-* want .57, old
> LTS versions want .53). It would be possible to modify our jenkinsfiles
> (automation scripts) to check the DPDK version, and run pip commands
> resetting the meson version accordingly, at the start of each testing
> job... but I have a couple concerns here with regards to
> stability/maintenance.
I would recommend against using the DPDK version as a guide. However, the
meson version is included in the project options in the meson.build file of
the code. Could you use "grep meson_version meson.build" in a script to
extra the required version info? If it's helpful, we can possibly provide
some sort of compatibility guarantee of the format of this line.
Regards,
/Bruce
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH 0/5] Increase minimum meson version
2024-10-08 8:28 ` David Marchand
2024-10-08 19:49 ` [OS-Team] [dpdklab] " Patrick Robb
@ 2024-10-09 1:04 ` zhoumin
2024-10-09 14:31 ` Patrick Robb
1 sibling, 1 reply; 27+ messages in thread
From: zhoumin @ 2024-10-09 1:04 UTC (permalink / raw)
To: David Marchand, dpdklab; +Cc: dev, mb, thomas, ci, Bruce Richardson
Hi David,
On Tues, Oct 8, 2024 at 8:28AM, David Marchand wrote:
> Hello CI guys,
>
> On Fri, Sep 20, 2024 at 2:57 PM Bruce Richardson
> <bruce.richardson@intel.com> wrote:
>> This patchset proposed increasing the minimum meson version to 0.57
>> and makes changes to update our build files appropriately for that
>> change: replacing deprecated functions, removing unnecessary version
>> checks and taking advantage of some new capabilities.
>>
>> Why 0.57? No one particular reason; it's mainly a conservative version
>> bump that doesn't have many impacts, but still gives us the minimum
>> updates we need to replace the deprecated get_cross_properties fn
>> and have a few extra features guaranteed available.
>>
>> Bruce Richardson (5):
>> build: increase minimum meson version to 0.57
>> build: remove version check on compiler links function
>> build: remove unnecessary version checks
>> build: use version file support from meson
>> build: replace deprecated meson function
>>
>> .ci/linux-setup.sh | 2 +-
>> config/arm/meson.build | 4 ++--
>> config/meson.build | 8 ++++----
>> config/riscv/meson.build | 4 ++--
>> doc/api/meson.build | 2 +-
>> doc/guides/linux_gsg/sys_reqs.rst | 2 +-
>> doc/guides/prog_guide/build-sdk-meson.rst | 2 +-
>> drivers/common/qat/meson.build | 2 +-
>> drivers/crypto/ipsec_mb/meson.build | 2 +-
>> drivers/event/cnxk/meson.build | 2 +-
>> drivers/meson.build | 7 ++-----
>> drivers/net/cnxk/meson.build | 2 +-
>> lib/meson.build | 6 ------
>> meson.build | 7 ++-----
>> 14 files changed, 20 insertions(+), 32 deletions(-)
> This series can't be merged until the (UNH and LoongArch) CI are ready
> for such a change.
>
> TL;DR: the meson minimum version is being changed from 0.53.2 to 0.57
> in the current release.
>
> @UNH @Min Zhou
> How long would it take for all CI to be ready for this change?
It's OK for Loongson lab. The meson version for DPDK CI in Loongson lab
is 0.63.0.
> Important note: if relevant to your CI, testing against LTS branches
> must still be done with the 0.53.2 version, so no change relying on
> post 0.53.2 meson feature gets backported.
>
>
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [OS-Team] [dpdklab] Re: [PATCH 0/5] Increase minimum meson version
2024-10-08 20:04 ` Bruce Richardson
@ 2024-10-09 14:27 ` Patrick Robb
0 siblings, 0 replies; 27+ messages in thread
From: Patrick Robb @ 2024-10-09 14:27 UTC (permalink / raw)
To: Bruce Richardson
Cc: David Marchand, dpdklab, Min Zhou, dev, mb, thomas, ci,
Puttaswamy, Rajesh T, Cody Cheng, Adam Hassick
[-- Attachment #1: Type: text/plain, Size: 3532 bytes --]
On Tue, Oct 8, 2024 at 4:04 PM Bruce Richardson <bruce.richardson@intel.com>
wrote:
>
> > UNH does not use it much
> > as we opt to meet the meson dependency separately in the dpdk-ci
> > project's container template engine.
>
> That's a bit of a pity, since we can't update the meson version
> automatically as part of the meson update as we do with CIs using the
> linux-setup script. Is there some other file that can be in the DPDK main
> repo that can contain this details to regular DPDK patches can update the
> CI too as part of a meson update?
>
>
I think the only way to do that would be to submit a patch alongside for
the dpdk ci container template engine:
https://git.dpdk.org/tools/dpdk-ci/tree/containers/README.md. But this
would not work very well as dpdk-ci is a separate repo from dpdk, so you
can't really package the meson update and the ci update in one patchseries.
So, I guess based on your comments it seems like the best solution is to
remove the meson step from the container template engine (Dockerfiles) and
run the linux-setup.sh script right before each testrun, which solves the
problem you raise about updating dpdk and CI side by side, and solves the
main vs LTS issue. And of course it comes with the benefit of making CI
processes more common across labs. I had run through this idea with Adam
yesterday and we agreed that it would work but decided it was our second
favorite option... but I think with the points you are raising it is clear
this is the correct route to take.
> > It will also require updates to the container template engine, which I
> > can get Cody started on tomorrow.
> >
> > Important note: if relevant to your CI, testing against LTS branches
> > must still be done with the 0.53.2 version, so no change relying on
> > post 0.53.2 meson feature gets backported.
> >
> > Okay, full disclosure I don't think this is something we handled the
> > last time the meson version got bumped in 2022. So, back then we just
> > bumped the meson version for all environments to .53, then did LTS
> > testing for 19.11, 20.11, 21.11 from environments running meson .53.
> > But, I understand how this is an issue and something we should avoid
> > this go around.
> > However, it is not ideal to set the meson version "at runtime" for CI
> > testing based on the repo under test (mainline and next-* want .57,
> old
> > LTS versions want .53). It would be possible to modify our
> jenkinsfiles
> > (automation scripts) to check the DPDK version, and run pip commands
> > resetting the meson version accordingly, at the start of each testing
> > job... but I have a couple concerns here with regards to
> > stability/maintenance.
>
> I would recommend against using the DPDK version as a guide. However, the
> meson version is included in the project options in the meson.build file of
> the code. Could you use "grep meson_version meson.build" in a script to
> extra the required version info? If it's helpful, we can possibly provide
> some sort of compatibility guarantee of the format of this line.
>
Thanks this seems like another good option (I did not realize we could get
this from meson.build) and something we can fall back on if usage of the
linux-setup.sh is problematic in any way.
So, we have a different strategy but the timeline should be the same as
this is all fairly trivial. Let me know if yall have any concerns.
Cheers.
[-- Attachment #2: Type: text/html, Size: 4382 bytes --]
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH 0/5] Increase minimum meson version
2024-10-09 1:04 ` zhoumin
@ 2024-10-09 14:31 ` Patrick Robb
2024-10-14 1:24 ` zhoumin
0 siblings, 1 reply; 27+ messages in thread
From: Patrick Robb @ 2024-10-09 14:31 UTC (permalink / raw)
To: zhoumin; +Cc: David Marchand, dpdklab, dev, mb, thomas, ci, Bruce Richardson
[-- Attachment #1: Type: text/plain, Size: 3045 bytes --]
Hi Min Zhou,
I think it makes sense for you to set your meson version to the minimum
version supported for DPDK (so, .57 now I suppose) instead of .63. The
principle that David described above regarding LTS is also true for main.
So, for the main and next-* branch testing that Loongson lab does, we want
our CI testing to verify that no change relying on post .57 meson features
get merged into main.
On Tue, Oct 8, 2024 at 9:07 PM zhoumin <zhoumin@loongson.cn> wrote:
> Hi David,
>
> On Tues, Oct 8, 2024 at 8:28AM, David Marchand wrote:
> > Hello CI guys,
> >
> > On Fri, Sep 20, 2024 at 2:57 PM Bruce Richardson
> > <bruce.richardson@intel.com> wrote:
> >> This patchset proposed increasing the minimum meson version to 0.57
> >> and makes changes to update our build files appropriately for that
> >> change: replacing deprecated functions, removing unnecessary version
> >> checks and taking advantage of some new capabilities.
> >>
> >> Why 0.57? No one particular reason; it's mainly a conservative version
> >> bump that doesn't have many impacts, but still gives us the minimum
> >> updates we need to replace the deprecated get_cross_properties fn
> >> and have a few extra features guaranteed available.
> >>
> >> Bruce Richardson (5):
> >> build: increase minimum meson version to 0.57
> >> build: remove version check on compiler links function
> >> build: remove unnecessary version checks
> >> build: use version file support from meson
> >> build: replace deprecated meson function
> >>
> >> .ci/linux-setup.sh | 2 +-
> >> config/arm/meson.build | 4 ++--
> >> config/meson.build | 8 ++++----
> >> config/riscv/meson.build | 4 ++--
> >> doc/api/meson.build | 2 +-
> >> doc/guides/linux_gsg/sys_reqs.rst | 2 +-
> >> doc/guides/prog_guide/build-sdk-meson.rst | 2 +-
> >> drivers/common/qat/meson.build | 2 +-
> >> drivers/crypto/ipsec_mb/meson.build | 2 +-
> >> drivers/event/cnxk/meson.build | 2 +-
> >> drivers/meson.build | 7 ++-----
> >> drivers/net/cnxk/meson.build | 2 +-
> >> lib/meson.build | 6 ------
> >> meson.build | 7 ++-----
> >> 14 files changed, 20 insertions(+), 32 deletions(-)
> > This series can't be merged until the (UNH and LoongArch) CI are ready
> > for such a change.
> >
> > TL;DR: the meson minimum version is being changed from 0.53.2 to 0.57
> > in the current release.
> >
> > @UNH @Min Zhou
> > How long would it take for all CI to be ready for this change?
> It's OK for Loongson lab. The meson version for DPDK CI in Loongson lab
> is 0.63.0.
> > Important note: if relevant to your CI, testing against LTS branches
> > must still be done with the 0.53.2 version, so no change relying on
> > post 0.53.2 meson feature gets backported.
> >
> >
>
>
[-- Attachment #2: Type: text/html, Size: 3943 bytes --]
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH 0/5] Increase minimum meson version
2024-10-09 14:31 ` Patrick Robb
@ 2024-10-14 1:24 ` zhoumin
2024-10-16 13:08 ` Patrick Robb
0 siblings, 1 reply; 27+ messages in thread
From: zhoumin @ 2024-10-14 1:24 UTC (permalink / raw)
To: Patrick Robb
Cc: David Marchand, dpdklab, dev, mb, thomas, ci, Bruce Richardson
[-- Attachment #1: Type: text/plain, Size: 3638 bytes --]
Hi Patrick Robb,
Thank you for your reminding. I have set the meson version to 0.57.0 in
Loongson lab.
On Wed, Oct 9, 2024 at 2:31PM, Patrick Robb wrote:
> Hi Min Zhou,
>
> I think it makes sense for you to set your meson version to the
> minimum version supported for DPDK (so, .57 now I suppose) instead of
> .63. The principle that David described above regarding LTS is also
> true for main. So, for the main and next-* branch testing that
> Loongson lab does, we want our CI testing to verify that no change
> relying on post .57 meson features get merged into main.
>
> On Tue, Oct 8, 2024 at 9:07 PM zhoumin <zhoumin@loongson.cn
> <mailto:zhoumin@loongson.cn>> wrote:
>
> Hi David,
>
> On Tues, Oct 8, 2024 at 8:28AM, David Marchand wrote:
> > Hello CI guys,
> >
> > On Fri, Sep 20, 2024 at 2:57 PM Bruce Richardson
> > <bruce.richardson@intel.com <mailto:bruce.richardson@intel.com>>
> wrote:
> >> This patchset proposed increasing the minimum meson version to 0.57
> >> and makes changes to update our build files appropriately for that
> >> change: replacing deprecated functions, removing unnecessary
> version
> >> checks and taking advantage of some new capabilities.
> >>
> >> Why 0.57? No one particular reason; it's mainly a conservative
> version
> >> bump that doesn't have many impacts, but still gives us the minimum
> >> updates we need to replace the deprecated get_cross_properties fn
> >> and have a few extra features guaranteed available.
> >>
> >> Bruce Richardson (5):
> >> build: increase minimum meson version to 0.57
> >> build: remove version check on compiler links function
> >> build: remove unnecessary version checks
> >> build: use version file support from meson
> >> build: replace deprecated meson function
> >>
> >> .ci/linux-setup.sh | 2 +-
> >> config/arm/meson.build | 4 ++--
> >> config/meson.build | 8 ++++----
> >> config/riscv/meson.build | 4 ++--
> >> doc/api/meson.build | 2 +-
> >> doc/guides/linux_gsg/sys_reqs.rst | 2 +-
> >> doc/guides/prog_guide/build-sdk-meson.rst | 2 +-
> >> drivers/common/qat/meson.build | 2 +-
> >> drivers/crypto/ipsec_mb/meson.build | 2 +-
> >> drivers/event/cnxk/meson.build | 2 +-
> >> drivers/meson.build | 7 ++-----
> >> drivers/net/cnxk/meson.build | 2 +-
> >> lib/meson.build | 6 ------
> >> meson.build | 7 ++-----
> >> 14 files changed, 20 insertions(+), 32 deletions(-)
> > This series can't be merged until the (UNH and LoongArch) CI are
> ready
> > for such a change.
> >
> > TL;DR: the meson minimum version is being changed from 0.53.2 to
> 0.57
> > in the current release.
> >
> > @UNH @Min Zhou
> > How long would it take for all CI to be ready for this change?
> It's OK for Loongson lab. The meson version for DPDK CI in
> Loongson lab
> is 0.63.0.
> > Important note: if relevant to your CI, testing against LTS branches
> > must still be done with the 0.53.2 version, so no change relying on
> > post 0.53.2 meson feature gets backported.
> >
> >
>
[-- Attachment #2: Type: text/html, Size: 5416 bytes --]
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH 1/5] build: increase minimum meson version to 0.57
2024-09-20 12:57 ` [PATCH 1/5] build: increase minimum meson version to 0.57 Bruce Richardson
@ 2024-10-15 8:16 ` Robin Jarry
0 siblings, 0 replies; 27+ messages in thread
From: Robin Jarry @ 2024-10-15 8:16 UTC (permalink / raw)
To: Bruce Richardson, dev; +Cc: mb, thomas, david.marchand
Bruce Richardson, Sep 20, 2024 at 14:57:
> In order to work around some deprecated functions in meson, we need to
> increase meson version. Increasing to 0.57 to also gain support for
> other useful features for us in DPDK. Changes of interest to DPDK
> include:
>
> * Use get_external_property instead of get_cross_property
> * Ability to use a VERSION file rather than hacking it with scripting
> * Ability to set built-in options in cross-build files
> * Ability to set pkg_config_libdir in cross-build files
>
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Reviewed-by: Robin Jarry <rjarry@redhat.com>
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH 2/5] build: remove version check on compiler links function
2024-09-20 12:57 ` [PATCH 2/5] build: remove version check on compiler links function Bruce Richardson
@ 2024-10-15 8:16 ` Robin Jarry
0 siblings, 0 replies; 27+ messages in thread
From: Robin Jarry @ 2024-10-15 8:16 UTC (permalink / raw)
To: Bruce Richardson, dev; +Cc: mb, thomas, david.marchand, stable
Bruce Richardson, Sep 20, 2024 at 14:57:
> The "compiler.links()" function meson documentation [1] is a little
> unclear, in a casual reading implies that the function was new in 0.60
> meson release. In fact, it is only enhanced as described in that
> release, but is present earlier.
> As such, we can remove the version checks preceeding the calls to links
> function in our code.
>
> [1] https://mesonbuild.com/Reference-manual_returned_compiler.html#compilerlinks
>
> Fixes: fd809737cf8c ("common/qat: fix build with incompatible IPsec library")
> Fixes: fb94d8243894 ("crypto/ipsec_mb: add dependency check for cross build")
> Cc: stable@dpdk.org
>
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
Reviewed-by: Robin Jarry <rjarry@redhat.com>
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH 3/5] build: remove unnecessary version checks
2024-09-20 12:57 ` [PATCH 3/5] build: remove unnecessary version checks Bruce Richardson
2024-10-08 8:33 ` David Marchand
@ 2024-10-15 8:17 ` Robin Jarry
1 sibling, 0 replies; 27+ messages in thread
From: Robin Jarry @ 2024-10-15 8:17 UTC (permalink / raw)
To: Bruce Richardson, dev; +Cc: mb, thomas, david.marchand
Bruce Richardson, Sep 20, 2024 at 14:57:
> Since minimum meson version is now 0.57 we can remove all version checks
> for versions lower than that.
>
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
Reviewed-by: Robin Jarry <rjarry@redhat.com>
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH 4/5] build: use version file support from meson
2024-09-20 12:57 ` [PATCH 4/5] build: use version file support from meson Bruce Richardson
@ 2024-10-15 8:17 ` Robin Jarry
0 siblings, 0 replies; 27+ messages in thread
From: Robin Jarry @ 2024-10-15 8:17 UTC (permalink / raw)
To: Bruce Richardson, dev; +Cc: mb, thomas, david.marchand
Bruce Richardson, Sep 20, 2024 at 14:57:
> Rather than having to use run_command to shell out and read the VERSION
> file for the DPDK version, we can use the support added directly to
> meson in version 0.57.
>
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
Reviewed-by: Robin Jarry <rjarry@redhat.com>
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH 5/5] build: replace deprecated meson function
2024-09-20 12:57 ` [PATCH 5/5] build: replace deprecated meson function Bruce Richardson
@ 2024-10-15 8:17 ` Robin Jarry
0 siblings, 0 replies; 27+ messages in thread
From: Robin Jarry @ 2024-10-15 8:17 UTC (permalink / raw)
To: Bruce Richardson, dev; +Cc: mb, thomas, david.marchand
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>
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH 0/5] Increase minimum meson version
2024-10-14 1:24 ` zhoumin
@ 2024-10-16 13:08 ` Patrick Robb
2024-10-17 5:26 ` Patrick Robb
0 siblings, 1 reply; 27+ messages in thread
From: Patrick Robb @ 2024-10-16 13:08 UTC (permalink / raw)
To: zhoumin; +Cc: David Marchand, dpdklab, dev, mb, thomas, ci, Bruce Richardson
[-- Attachment #1: Type: text/plain, Size: 3498 bytes --]
UNH will be updated to be running from the linux setup script by the end of
the day today, and I'll send another response here.
On Sun, Oct 13, 2024 at 9:26 PM zhoumin <zhoumin@loongson.cn> wrote:
> Hi Patrick Robb,
>
> Thank you for your reminding. I have set the meson version to 0.57.0 in
> Loongson lab.
> On Wed, Oct 9, 2024 at 2:31PM, Patrick Robb wrote:
>
> Hi Min Zhou,
>
> I think it makes sense for you to set your meson version to the minimum
> version supported for DPDK (so, .57 now I suppose) instead of .63. The
> principle that David described above regarding LTS is also true for main.
> So, for the main and next-* branch testing that Loongson lab does, we want
> our CI testing to verify that no change relying on post .57 meson features
> get merged into main.
>
> On Tue, Oct 8, 2024 at 9:07 PM zhoumin <zhoumin@loongson.cn> wrote:
>
>> Hi David,
>>
>> On Tues, Oct 8, 2024 at 8:28AM, David Marchand wrote:
>> > Hello CI guys,
>> >
>> > On Fri, Sep 20, 2024 at 2:57 PM Bruce Richardson
>> > <bruce.richardson@intel.com> wrote:
>> >> This patchset proposed increasing the minimum meson version to 0.57
>> >> and makes changes to update our build files appropriately for that
>> >> change: replacing deprecated functions, removing unnecessary version
>> >> checks and taking advantage of some new capabilities.
>> >>
>> >> Why 0.57? No one particular reason; it's mainly a conservative version
>> >> bump that doesn't have many impacts, but still gives us the minimum
>> >> updates we need to replace the deprecated get_cross_properties fn
>> >> and have a few extra features guaranteed available.
>> >>
>> >> Bruce Richardson (5):
>> >> build: increase minimum meson version to 0.57
>> >> build: remove version check on compiler links function
>> >> build: remove unnecessary version checks
>> >> build: use version file support from meson
>> >> build: replace deprecated meson function
>> >>
>> >> .ci/linux-setup.sh | 2 +-
>> >> config/arm/meson.build | 4 ++--
>> >> config/meson.build | 8 ++++----
>> >> config/riscv/meson.build | 4 ++--
>> >> doc/api/meson.build | 2 +-
>> >> doc/guides/linux_gsg/sys_reqs.rst | 2 +-
>> >> doc/guides/prog_guide/build-sdk-meson.rst | 2 +-
>> >> drivers/common/qat/meson.build | 2 +-
>> >> drivers/crypto/ipsec_mb/meson.build | 2 +-
>> >> drivers/event/cnxk/meson.build | 2 +-
>> >> drivers/meson.build | 7 ++-----
>> >> drivers/net/cnxk/meson.build | 2 +-
>> >> lib/meson.build | 6 ------
>> >> meson.build | 7 ++-----
>> >> 14 files changed, 20 insertions(+), 32 deletions(-)
>> > This series can't be merged until the (UNH and LoongArch) CI are ready
>> > for such a change.
>> >
>> > TL;DR: the meson minimum version is being changed from 0.53.2 to 0.57
>> > in the current release.
>> >
>> > @UNH @Min Zhou
>> > How long would it take for all CI to be ready for this change?
>> It's OK for Loongson lab. The meson version for DPDK CI in Loongson lab
>> is 0.63.0.
>> > Important note: if relevant to your CI, testing against LTS branches
>> > must still be done with the 0.53.2 version, so no change relying on
>> > post 0.53.2 meson feature gets backported.
>> >
>> >
>>
>>
[-- Attachment #2: Type: text/html, Size: 5697 bytes --]
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH 0/5] Increase minimum meson version
2024-10-16 13:08 ` Patrick Robb
@ 2024-10-17 5:26 ` Patrick Robb
0 siblings, 0 replies; 27+ messages in thread
From: Patrick Robb @ 2024-10-17 5:26 UTC (permalink / raw)
To: David Marchand; +Cc: dpdklab, dev, mb, thomas, ci, Bruce Richardson, zhoumin
[-- Attachment #1: Type: text/plain, Size: 3700 bytes --]
UNH CI testing is ready for this change.
On Wed, Oct 16, 2024 at 9:08 AM Patrick Robb <probb@iol.unh.edu> wrote:
> UNH will be updated to be running from the linux setup script by the end
> of the day today, and I'll send another response here.
>
> On Sun, Oct 13, 2024 at 9:26 PM zhoumin <zhoumin@loongson.cn> wrote:
>
>> Hi Patrick Robb,
>>
>> Thank you for your reminding. I have set the meson version to 0.57.0 in
>> Loongson lab.
>> On Wed, Oct 9, 2024 at 2:31PM, Patrick Robb wrote:
>>
>> Hi Min Zhou,
>>
>> I think it makes sense for you to set your meson version to the minimum
>> version supported for DPDK (so, .57 now I suppose) instead of .63. The
>> principle that David described above regarding LTS is also true for main.
>> So, for the main and next-* branch testing that Loongson lab does, we want
>> our CI testing to verify that no change relying on post .57 meson features
>> get merged into main.
>>
>> On Tue, Oct 8, 2024 at 9:07 PM zhoumin <zhoumin@loongson.cn> wrote:
>>
>>> Hi David,
>>>
>>> On Tues, Oct 8, 2024 at 8:28AM, David Marchand wrote:
>>> > Hello CI guys,
>>> >
>>> > On Fri, Sep 20, 2024 at 2:57 PM Bruce Richardson
>>> > <bruce.richardson@intel.com> wrote:
>>> >> This patchset proposed increasing the minimum meson version to 0.57
>>> >> and makes changes to update our build files appropriately for that
>>> >> change: replacing deprecated functions, removing unnecessary version
>>> >> checks and taking advantage of some new capabilities.
>>> >>
>>> >> Why 0.57? No one particular reason; it's mainly a conservative version
>>> >> bump that doesn't have many impacts, but still gives us the minimum
>>> >> updates we need to replace the deprecated get_cross_properties fn
>>> >> and have a few extra features guaranteed available.
>>> >>
>>> >> Bruce Richardson (5):
>>> >> build: increase minimum meson version to 0.57
>>> >> build: remove version check on compiler links function
>>> >> build: remove unnecessary version checks
>>> >> build: use version file support from meson
>>> >> build: replace deprecated meson function
>>> >>
>>> >> .ci/linux-setup.sh | 2 +-
>>> >> config/arm/meson.build | 4 ++--
>>> >> config/meson.build | 8 ++++----
>>> >> config/riscv/meson.build | 4 ++--
>>> >> doc/api/meson.build | 2 +-
>>> >> doc/guides/linux_gsg/sys_reqs.rst | 2 +-
>>> >> doc/guides/prog_guide/build-sdk-meson.rst | 2 +-
>>> >> drivers/common/qat/meson.build | 2 +-
>>> >> drivers/crypto/ipsec_mb/meson.build | 2 +-
>>> >> drivers/event/cnxk/meson.build | 2 +-
>>> >> drivers/meson.build | 7 ++-----
>>> >> drivers/net/cnxk/meson.build | 2 +-
>>> >> lib/meson.build | 6 ------
>>> >> meson.build | 7 ++-----
>>> >> 14 files changed, 20 insertions(+), 32 deletions(-)
>>> > This series can't be merged until the (UNH and LoongArch) CI are ready
>>> > for such a change.
>>> >
>>> > TL;DR: the meson minimum version is being changed from 0.53.2 to 0.57
>>> > in the current release.
>>> >
>>> > @UNH @Min Zhou
>>> > How long would it take for all CI to be ready for this change?
>>> It's OK for Loongson lab. The meson version for DPDK CI in Loongson lab
>>> is 0.63.0.
>>> > Important note: if relevant to your CI, testing against LTS branches
>>> > must still be done with the 0.53.2 version, so no change relying on
>>> > post 0.53.2 meson feature gets backported.
>>> >
>>> >
>>>
>>>
[-- Attachment #2: Type: text/html, Size: 6107 bytes --]
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH 0/5] Increase minimum meson version
2024-09-20 12:57 [PATCH 0/5] Increase minimum meson version Bruce Richardson
` (8 preceding siblings ...)
2024-10-08 8:28 ` David Marchand
@ 2024-10-17 7:53 ` David Marchand
2024-10-17 10:04 ` Bruce Richardson
9 siblings, 1 reply; 27+ messages in thread
From: David Marchand @ 2024-10-17 7:53 UTC (permalink / raw)
To: Bruce Richardson
Cc: dev, mb, thomas, Ferruh Yigit, Chengwen Feng, Robin Jarry
On Fri, Sep 20, 2024 at 2:57 PM Bruce Richardson
<bruce.richardson@intel.com> wrote:
>
> This patchset proposed increasing the minimum meson version to 0.57
> and makes changes to update our build files appropriately for that
> change: replacing deprecated functions, removing unnecessary version
> checks and taking advantage of some new capabilities.
>
> Why 0.57? No one particular reason; it's mainly a conservative version
> bump that doesn't have many impacts, but still gives us the minimum
> updates we need to replace the deprecated get_cross_properties fn
> and have a few extra features guaranteed available.
>
> Bruce Richardson (5):
> build: increase minimum meson version to 0.57
> build: remove version check on compiler links function
> build: remove unnecessary version checks
> build: use version file support from meson
> build: replace deprecated meson function
>
> .ci/linux-setup.sh | 2 +-
> config/arm/meson.build | 4 ++--
> config/meson.build | 8 ++++----
> config/riscv/meson.build | 4 ++--
> doc/api/meson.build | 2 +-
> doc/guides/linux_gsg/sys_reqs.rst | 2 +-
> doc/guides/prog_guide/build-sdk-meson.rst | 2 +-
> drivers/common/qat/meson.build | 2 +-
> drivers/crypto/ipsec_mb/meson.build | 2 +-
> drivers/event/cnxk/meson.build | 2 +-
> drivers/meson.build | 7 ++-----
> drivers/net/cnxk/meson.build | 2 +-
> lib/meson.build | 6 ------
> meson.build | 7 ++-----
> 14 files changed, 20 insertions(+), 32 deletions(-)
The series looks good, and CI guys gave me the green light.
Series applied, thanks Bruce.
There is one remaining TODO in config/meson.build:
# MS linker requires special treatment.
# TODO: use cc.get_linker_id() with Meson >= 0.54
is_ms_compiler = is_windows and (cc.get_id() == 'msvc')
is_ms_linker = is_windows and (cc.get_id() == 'clang' or
is_ms_compiler)
--
David Marchand
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH 0/5] Increase minimum meson version
2024-10-17 7:53 ` David Marchand
@ 2024-10-17 10:04 ` Bruce Richardson
0 siblings, 0 replies; 27+ messages in thread
From: Bruce Richardson @ 2024-10-17 10:04 UTC (permalink / raw)
To: David Marchand; +Cc: dev, thomas, dmitry.kozliuk, roretzla
On Thu, Oct 17, 2024 at 09:53:18AM +0200, David Marchand wrote:
> On Fri, Sep 20, 2024 at 2:57 PM Bruce Richardson
> <bruce.richardson@intel.com> wrote:
> >
> > This patchset proposed increasing the minimum meson version to 0.57
> > and makes changes to update our build files appropriately for that
> > change: replacing deprecated functions, removing unnecessary version
> > checks and taking advantage of some new capabilities.
> >
> > Why 0.57? No one particular reason; it's mainly a conservative version
> > bump that doesn't have many impacts, but still gives us the minimum
> > updates we need to replace the deprecated get_cross_properties fn
> > and have a few extra features guaranteed available.
> >
> > Bruce Richardson (5):
> > build: increase minimum meson version to 0.57
> > build: remove version check on compiler links function
> > build: remove unnecessary version checks
> > build: use version file support from meson
> > build: replace deprecated meson function
> >
> > .ci/linux-setup.sh | 2 +-
> > config/arm/meson.build | 4 ++--
> > config/meson.build | 8 ++++----
> > config/riscv/meson.build | 4 ++--
> > doc/api/meson.build | 2 +-
> > doc/guides/linux_gsg/sys_reqs.rst | 2 +-
> > doc/guides/prog_guide/build-sdk-meson.rst | 2 +-
> > drivers/common/qat/meson.build | 2 +-
> > drivers/crypto/ipsec_mb/meson.build | 2 +-
> > drivers/event/cnxk/meson.build | 2 +-
> > drivers/meson.build | 7 ++-----
> > drivers/net/cnxk/meson.build | 2 +-
> > lib/meson.build | 6 ------
> > meson.build | 7 ++-----
> > 14 files changed, 20 insertions(+), 32 deletions(-)
>
> The series looks good, and CI guys gave me the green light.
> Series applied, thanks Bruce.
>
>
> There is one remaining TODO in config/meson.build:
>
> # MS linker requires special treatment.
> # TODO: use cc.get_linker_id() with Meson >= 0.54
> is_ms_compiler = is_windows and (cc.get_id() == 'msvc')
> is_ms_linker = is_windows and (cc.get_id() == 'clang' or
> is_ms_compiler)
>
Yep.
I'm hoping perhaps one of the windows maintainers/devs could look at this
because I see a number of possible linker values for windows listed in the
table at [1] and I'm not 100% sure which ones are to be accepted here.
/Bruce
[1] https://mesonbuild.com/Reference-tables.html#linker-ids
^ permalink raw reply [flat|nested] 27+ messages in thread
end of thread, other threads:[~2024-10-17 10:05 UTC | newest]
Thread overview: 27+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-09-20 12:57 [PATCH 0/5] Increase minimum meson version Bruce Richardson
2024-09-20 12:57 ` [PATCH 1/5] build: increase minimum meson version to 0.57 Bruce Richardson
2024-10-15 8:16 ` Robin Jarry
2024-09-20 12:57 ` [PATCH 2/5] build: remove version check on compiler links function Bruce Richardson
2024-10-15 8:16 ` Robin Jarry
2024-09-20 12:57 ` [PATCH 3/5] build: remove unnecessary version checks Bruce Richardson
2024-10-08 8:33 ` David Marchand
2024-10-15 8:17 ` Robin Jarry
2024-09-20 12:57 ` [PATCH 4/5] build: use version file support from meson Bruce Richardson
2024-10-15 8:17 ` Robin Jarry
2024-09-20 12:57 ` [PATCH 5/5] build: replace deprecated meson function Bruce Richardson
2024-10-15 8:17 ` Robin Jarry
2024-09-21 23:21 ` [PATCH 0/5] Increase minimum meson version Ferruh Yigit
2024-09-23 1:59 ` fengchengwen
2024-09-23 2:19 ` fengchengwen
2024-09-30 20:55 ` Tyler Retzlaff
2024-10-08 8:28 ` David Marchand
2024-10-08 19:49 ` [OS-Team] [dpdklab] " Patrick Robb
2024-10-08 20:04 ` Bruce Richardson
2024-10-09 14:27 ` Patrick Robb
2024-10-09 1:04 ` zhoumin
2024-10-09 14:31 ` Patrick Robb
2024-10-14 1:24 ` zhoumin
2024-10-16 13:08 ` Patrick Robb
2024-10-17 5:26 ` Patrick Robb
2024-10-17 7:53 ` David Marchand
2024-10-17 10:04 ` Bruce Richardson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).