From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 07EE2A04AD; Mon, 24 Jan 2022 19:12:44 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9413B427CC; Mon, 24 Jan 2022 19:12:44 +0100 (CET) Received: from mail-io1-f48.google.com (mail-io1-f48.google.com [209.85.166.48]) by mails.dpdk.org (Postfix) with ESMTP id 5DEBE4117A for ; Mon, 24 Jan 2022 19:12:43 +0100 (CET) Received: by mail-io1-f48.google.com with SMTP id 9so4954719iou.2 for ; Mon, 24 Jan 2022 10:12:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=7kofRxESbWUVnmGj/nSYKrj/6xlsRFNJPKqfglPkxD8=; b=hrw7KL/x3EZy6FMlKAawWodeVI6blLQaXPYRthGZGXRnenu6YFgQkdhuiBLlrZIb/Z 4XM74FiSmseHBN4QqgTiC/I0EKYT13wK8e63hvrELR8Kknc6jfVv3YiRVKf6Yfyw+ktc fWRELoZnzH9RzIioPxjw7mgWQeb5GsvEsHrbuqtDzO/fW2GZt5lYRWdtHRjWjpFBD3KO WiqWSA5OgLg5MmCUolZbLhfF/YcV72sxLCIR6PhA6VRza8E633aDhvvD93B0oac8YXPb 5OW3rTi2MbqFEzxGbi61MrpZe1kECaRkpGr5YfUh695s0qHW/SIEzLADd/LJTEwVCiuq IYgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=7kofRxESbWUVnmGj/nSYKrj/6xlsRFNJPKqfglPkxD8=; b=Wl5bFiqDxeRB2FrVs6SM9JdIvXRblmKmKkAIlYTVZPWdezET1wLeMdDZk223H7UNXW SGChsJWCxPakKTDeEjoz726pJCU/Gwjt05JlYPiS+l0/jlIUSO7reHaaEO7dXbm4b/XK kfRsxmvFIhufQiiIXH7xY4BXm1+1MHbIlwMW3dWxJ/9D+tMtXqCj0Qph14/efD+oAp0A v5RGfTbSzepOoFfqUhRnp/TeStHUz3GunxRW/oeDQZZ6caGFkKdESFkV5HTfJi3joQ9F HRK+ZbpCbFbeJCl+FW2rd2EoT8Ti5e2CI4etjpToolj+meHw5X+WWn1AP7ln8uJhAAAV DjBg== X-Gm-Message-State: AOAM533OAmWjwJ94yNficfKh0gakFXxVjLw+zCV/FCIuqBxOKImP6WE0 0XgkJ5X1hP+NxEG7K/F8QvjROGoGELnhaosDwLk= X-Google-Smtp-Source: ABdhPJx47EcZ50nDmYgScNl567aD7x3wFAeRWwq0K7s7TwQysveS43HjbmCC7sQmH+04eYEpi/tdURZoeIcapPxVLdQ= X-Received: by 2002:a5e:dd02:: with SMTP id t2mr4231481iop.25.1643047962610; Mon, 24 Jan 2022 10:12:42 -0800 (PST) MIME-Version: 1.0 References: <20220124174959.153629-1-bruce.richardson@intel.com> In-Reply-To: <20220124174959.153629-1-bruce.richardson@intel.com> From: Jerin Jacob Date: Mon, 24 Jan 2022 23:42:16 +0530 Message-ID: Subject: Re: [PATCH] build: remove deprecated meson functions To: Bruce Richardson Cc: dpdk-dev Content-Type: text/plain; charset="UTF-8" X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org On Mon, Jan 24, 2022 at 11:20 PM Bruce Richardson wrote: > > 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 Tested-by: Jerin Jacob > --- > 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 >