From: Mauro Carvalho Chehab <mauro.chehab@linux.intel.com>
To: igt-dev@lists.freedesktop.org
Subject: [igt-dev] [PATCH i-g-t v4 4/8] meson: get rid of a future-deprecated warning
Date: Wed, 22 Mar 2023 07:49:59 +0100 [thread overview]
Message-ID: <20230322065003.1758611-5-mauro.chehab@linux.intel.com> (raw)
In-Reply-To: <20230322065003.1758611-1-mauro.chehab@linux.intel.com>
From: Mauro Carvalho Chehab <mchehab@kernel.org>
A warning is generated with newer meson versions:
NOTICE: Future-deprecated features used:
* 0.56.0: {'meson.source_root'}
While there is a new macro to get it, that would rise the
dependency chain to meson 0.56. So, instead, just store it
on a variable.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
lib/meson.build | 2 +-
meson.build | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/lib/meson.build b/lib/meson.build
index 768ce90b54df..ad9e2abef4c3 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -178,7 +178,7 @@ endif
if get_option('srcdir') != ''
srcdir = join_paths(get_option('srcdir'), 'tests')
else
- srcdir = join_paths(meson.source_root(), 'tests')
+ srcdir = join_paths(source_root, 'tests')
endif
if get_option('version_hash') != ''
diff --git a/meson.build b/meson.build
index b896283e3244..12d5113a9042 100644
--- a/meson.build
+++ b/meson.build
@@ -13,6 +13,9 @@ if get_option('b_ndebug') != 'false'
error('Building without -Db_ndebug=false is not supported')
endif
+# meson.source_root is marked as a future-deprecated feature
+source_root = meson.current_source_dir()
+
cc = meson.get_compiler('c')
# Also make sure that the user doesn't have -DNDEBUG defined in their config
--
2.39.2
next prev parent reply other threads:[~2023-03-22 6:50 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-22 6:49 [igt-dev] [PATCH i-g-t v4 0/8] Build Xe test documentation Mauro Carvalho Chehab
2023-03-22 6:49 ` [igt-dev] [PATCH i-g-t v4 1/8] meson: build " Mauro Carvalho Chehab
2023-03-22 6:49 ` [igt-dev] [PATCH i-g-t v4 2/8] testplan: build also a PDF file with the testplan Mauro Carvalho Chehab
2023-03-22 6:49 ` [igt-dev] [PATCH i-g-t v4 3/8] meson.build: place gtk-doc dependencies check at the right place Mauro Carvalho Chehab
2023-03-22 6:49 ` Mauro Carvalho Chehab [this message]
2023-03-22 6:50 ` [igt-dev] [PATCH i-g-t v4 5/8] meson: get rid of tests/xe/meson.build Mauro Carvalho Chehab
2023-03-22 6:50 ` [igt-dev] [PATCH i-g-t v4 6/8] testplan/meson.build: cleanup dependency chain Mauro Carvalho Chehab
2023-03-22 6:50 ` [igt-dev] [PATCH i-g-t v4 7/8] testplan/meson.build: use join_paths() Mauro Carvalho Chehab
2023-03-22 6:50 ` [igt-dev] [PATCH i-g-t v4 8/8] testplan/meson.build: re-indent file Mauro Carvalho Chehab
2023-03-22 6:57 ` [igt-dev] ✗ GitLab.Pipeline: warning for Build Xe test documentation (rev3) Patchwork
2023-03-22 7:26 ` [igt-dev] ✓ Fi.CI.BAT: success " Patchwork
2023-03-22 10:31 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
-- strict thread matches above, loose matches on Subject: below --
2023-03-22 8:28 [igt-dev] [PATCH i-g-t v4 0/8] Build Xe test documentation Mauro Carvalho Chehab
2023-03-22 8:28 ` [igt-dev] [PATCH i-g-t v4 4/8] meson: get rid of a future-deprecated warning Mauro Carvalho Chehab
2023-03-22 19:11 ` Kamil Konieczny
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=20230322065003.1758611-5-mauro.chehab@linux.intel.com \
--to=mauro.chehab@linux.intel.com \
--cc=igt-dev@lists.freedesktop.org \
/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