From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: mb@smartsharesystems.com, thomas@monjalon.net,
david.marchand@redhat.com,
Bruce Richardson <bruce.richardson@intel.com>
Subject: [PATCH 3/5] build: remove unnecessary version checks
Date: Fri, 20 Sep 2024 13:57:35 +0100 [thread overview]
Message-ID: <20240920125737.1197969-4-bruce.richardson@intel.com> (raw)
In-Reply-To: <20240920125737.1197969-1-bruce.richardson@intel.com>
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
next prev parent reply other threads:[~2024-09-20 12:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2024-09-20 12:57 ` [PATCH 4/5] build: use version file support from meson Bruce Richardson
2024-09-20 12:57 ` [PATCH 5/5] build: replace deprecated meson function Bruce Richardson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240920125737.1197969-4-bruce.richardson@intel.com \
--to=bruce.richardson@intel.com \
--cc=david.marchand@redhat.com \
--cc=dev@dpdk.org \
--cc=mb@smartsharesystems.com \
--cc=thomas@monjalon.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).