From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id D4E0989C05 for ; Wed, 22 Mar 2023 08:28:40 +0000 (UTC) Received: from linux.intel.com (maurocar-mobl2.ger.corp.intel.com [10.252.26.250]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by linux.intel.com (Postfix) with ESMTPS id EBA00580C7C for ; Wed, 22 Mar 2023 01:28:31 -0700 (PDT) Received: from maurocar by linux.intel.com with local (Exim 4.96) (envelope-from ) id 1petpe-007QdI-08 for igt-dev@lists.freedesktop.org; Wed, 22 Mar 2023 09:28:30 +0100 From: Mauro Carvalho Chehab To: igt-dev@lists.freedesktop.org Date: Wed, 22 Mar 2023 09:28:22 +0100 Message-Id: <20230322082826.1770429-5-mauro.chehab@linux.intel.com> In-Reply-To: <20230322082826.1770429-1-mauro.chehab@linux.intel.com> References: <20230322082826.1770429-1-mauro.chehab@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [igt-dev] [PATCH i-g-t v4 4/8] meson: get rid of a future-deprecated warning List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: From: Mauro Carvalho Chehab 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 --- 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