From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: jerinjacobk@gmail.com, Bruce Richardson <bruce.richardson@intel.com>
Subject: [PATCH] build: remove deprecated meson functions
Date: Mon, 24 Jan 2022 17:49:59 +0000 [thread overview]
Message-ID: <20220124174959.153629-1-bruce.richardson@intel.com> (raw)
In-Reply-To: <bug-926-3@http.bugs.dpdk.org/>
Starting in meson 0.56, the functions meson.source_root() and
meson.build_root() are deprecated and to be replaced by the [more
descriptive] functions: project_source_root()/global_source_root() and
project_build_root()/global_build_root(). Unfortunately, these new
replacement functions were only added in 0.56 release too, so to use
them we would need version checks for old/new functions to remove the
deprecation warnings.
However, the functions "current_build_dir()" and "current_source_dir()"
remain unaffected by all this, so we can bypass the versioning problem,
by saving off these values to "dpdk_source_root" and "dpdk_build_root"
in the top-level meson.build file
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
doc/api/meson.build | 10 +++++-----
kernel/freebsd/meson.build | 4 ++--
kernel/linux/kni/meson.build | 8 ++++----
meson.build | 2 ++
4 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/doc/api/meson.build b/doc/api/meson.build
index 7e2b429ac8..5c25b92092 100644
--- a/doc/api/meson.build
+++ b/doc/api/meson.build
@@ -24,7 +24,7 @@ htmldir = join_paths(get_option('datadir'), 'doc', 'dpdk')
# So use a configure option for now.
example = custom_target('examples.dox',
output: 'examples.dox',
- command: [generate_examples, join_paths(meson.source_root(), 'examples'), '@OUTPUT@'],
+ command: [generate_examples, join_paths(dpdk_source_root, 'examples'), '@OUTPUT@'],
depfile: 'examples.dox.d',
install: get_option('enable_docs'),
install_dir: htmldir,
@@ -32,11 +32,11 @@ example = custom_target('examples.dox',
cdata = configuration_data()
cdata.set('VERSION', meson.project_version())
-cdata.set('API_EXAMPLES', join_paths(meson.build_root(), 'doc', 'api', 'examples.dox'))
-cdata.set('OUTPUT', join_paths(meson.build_root(), 'doc', 'api'))
+cdata.set('API_EXAMPLES', join_paths(dpdk_build_root, 'doc', 'api', 'examples.dox'))
+cdata.set('OUTPUT', join_paths(dpdk_build_root, 'doc', 'api'))
cdata.set('HTML_OUTPUT', 'html')
-cdata.set('TOPDIR', meson.source_root())
-cdata.set('STRIP_FROM_PATH', ' '.join([meson.source_root(), join_paths(meson.build_root(), 'doc', 'api')]))
+cdata.set('TOPDIR', dpdk_source_root)
+cdata.set('STRIP_FROM_PATH', ' '.join([dpdk_source_root, join_paths(dpdk_build_root, 'doc', 'api')]))
cdata.set('WARN_AS_ERROR', 'NO')
if get_option('werror')
cdata.set('WARN_AS_ERROR', 'YES')
diff --git a/kernel/freebsd/meson.build b/kernel/freebsd/meson.build
index bf5aa20a55..1f612711be 100644
--- a/kernel/freebsd/meson.build
+++ b/kernel/freebsd/meson.build
@@ -9,8 +9,8 @@ kmods = ['contigmem', 'nic_uio']
# right now, which allows us to simplify things. We pull in the sourcer
# files from the individual meson.build files, and then use a custom
# target to call make, passing in the values as env parameters.
-kmod_cflags = ['-I' + meson.build_root(),
- '-I' + join_paths(meson.source_root(), 'config'),
+kmod_cflags = ['-I' + dpdk_build_root,
+ '-I' + join_paths(dpdk_source_root, 'config'),
'-include rte_config.h']
# to avoid warnings due to race conditions with creating the dev_if.h, etc.
diff --git a/kernel/linux/kni/meson.build b/kernel/linux/kni/meson.build
index c683fc7b36..d3743eeef4 100644
--- a/kernel/linux/kni/meson.build
+++ b/kernel/linux/kni/meson.build
@@ -29,10 +29,10 @@ custom_target('rte_kni',
'M=' + meson.current_build_dir(),
'src=' + meson.current_source_dir(),
' '.join(['MODULE_CFLAGS=', kmod_cflags,'-include '])
- + meson.source_root() + '/config/rte_config.h' +
- ' -I' + meson.source_root() + '/lib/eal/include' +
- ' -I' + meson.source_root() + '/lib/kni' +
- ' -I' + meson.build_root() +
+ + dpdk_source_root + '/config/rte_config.h' +
+ ' -I' + dpdk_source_root + '/lib/eal/include' +
+ ' -I' + dpdk_source_root + '/lib/kni' +
+ ' -I' + dpdk_build_root +
' -I' + meson.current_source_dir(),
'modules'] + cross_args,
depends: kni_mkfile,
diff --git a/meson.build b/meson.build
index 0a844bce9e..6641d0ed80 100644
--- a/meson.build
+++ b/meson.build
@@ -27,6 +27,8 @@ endif
# set up some global vars for compiler, platform, configuration, etc.
cc = meson.get_compiler('c')
+dpdk_source_root = meson.current_source_dir()
+dpdk_build_root = meson.current_build_dir()
dpdk_conf = configuration_data()
dpdk_libraries = []
dpdk_static_libraries = []
--
2.32.0
next prev parent reply other threads:[~2022-01-24 17:54 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-24 14:16 [Bug 926] meson: Use of Future-deprecated features bugzilla
2022-01-24 17:49 ` Bruce Richardson [this message]
2022-01-24 18:12 ` [PATCH] build: remove deprecated meson functions Jerin Jacob
2022-02-02 17:47 ` Thomas Monjalon
2022-03-15 16:44 ` [Bug 926] meson: Use of Future-deprecated features bugzilla
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=20220124174959.153629-1-bruce.richardson@intel.com \
--to=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
--cc=jerinjacobk@gmail.com \
/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).