diff mbox series

[1/5] build: simplify subdirectory detection for EAL

Message ID	20190409092933.55356-2-bruce.richardson@intel.com (mailing list archive)
State	Superseded, archived
Delegated to:	Thomas Monjalon
Headers	From: Bruce Richardson <bruce.richardson@intel.com> To: dev@dpdk.org Cc: Bruce Richardson <bruce.richardson@intel.com> Date: Tue, 9 Apr 2019 10:29:29 +0100 Message-Id: <20190409092933.55356-2-bruce.richardson@intel.com> In-Reply-To: <20190409092933.55356-1-bruce.richardson@intel.com> References: <20190409092933.55356-1-bruce.richardson@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH 1/5] build: simplify subdirectory detection for EAL Precedence: list Errors-To: dev-bounces@dpdk.org Sender: "dev" <dev-bounces@dpdk.org>
Series	small cleanup and fixes \| [0/5] small cleanup and fixes [1/5] build: simplify subdirectory detection for EAL [2/5] build: increase readability via shortcut variables [3/5] distributor: skip building if power library not found [4/5] examples/l2fwd-cat: fix build on FreeBSD [5/5] devtools/test-meson-builds: fix support for FreeBSD

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK
ci/Intel-compilation	success	Compilation OK
ci/intel-Performance-Testing	success	Performance Testing PASS
ci/mellanox-Performance-Testing	success	Performance Testing PASS

Commit Message

Bruce Richardson April 9, 2019, 9:29 a.m. UTC

  Within EAL we had a series of if statements for selecting the EAL directory
to use. Now that the directory names match those of the OS's they are for
we can instead just use a generated subdirectory name, shortening the code.
To avoid strange errors, we still need to check for unsupported OS's, but
do this check up-front in the config meson.build file.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 config/meson.build         |  7 +++++++
 lib/librte_eal/meson.build | 17 ++---------------
 2 files changed, 9 insertions(+), 15 deletions(-)

Comments

Luca Boccassi April 9, 2019, 10:34 a.m. UTC | #1

On Tue, 2019-04-09 at 10:29 +0100, Bruce Richardson wrote:
> Within EAL we had a series of if statements for selecting the EAL
> directory
> to use. Now that the directory names match those of the OS's they are
> for
> we can instead just use a generated subdirectory name, shortening the
> code.
> To avoid strange errors, we still need to check for unsupported OS's,
> but
> do this check up-front in the config meson.build file.
> 
> Signed-off-by: Bruce Richardson <
> bruce.richardson@intel.com
> >
> ---
>  config/meson.build         |  7 +++++++
>  lib/librte_eal/meson.build | 17 ++---------------
>  2 files changed, 9 insertions(+), 15 deletions(-)
> 
> diff --git a/config/meson.build b/config/meson.build
> index 483139b10..ce6af2595 100644
> --- a/config/meson.build
> +++ b/config/meson.build
> @@ -1,6 +1,13 @@
>  # SPDX-License-Identifier: BSD-3-Clause
>  # Copyright(c) 2017-2019 Intel Corporation
>  
> +# check the OS is supported, rather than going any further
> +supported_exec_envs = ['freebsd', 'linux', 'windows']
> +exec_env = host_machine.system()
> +if not supported_exec_envs.contains(exec_env)
> +	error('unsupported system type "@0@"'.format(exec_env))
> +endif
> +
>  # set the major version, which might be used by drivers and
> libraries
>  # depending on the configuration options
>  pver = meson.project_version().split('.')
> diff --git a/lib/librte_eal/meson.build b/lib/librte_eal/meson.build
> index 1863622c0..fa36b20e0 100644
> --- a/lib/librte_eal/meson.build
> +++ b/lib/librte_eal/meson.build
> @@ -9,21 +9,8 @@ subdir('common') # defines common_sources,
> common_objs, etc.
>  
>  # Now do OS/exec-env specific settings, including building kernel
> modules
>  # The <exec-env>/eal/meson.build file should define env_sources,
> etc.
> -if host_machine.system() == 'linux'
> -	dpdk_conf.set('RTE_EXEC_ENV_LINUX', 1)
> -	subdir('linux/eal')
> -
> -elif host_machine.system() == 'freebsd'
> -	dpdk_conf.set('RTE_EXEC_ENV_FREEBSD', 1)
> -	subdir('freebsd/eal')
> -
> -elif host_machine.system() == 'windows'
> -	dpdk_conf.set('RTE_EXEC_ENV_WINDOWS', 1)
> -	subdir('windows/eal')
> -
> -else
> -	error('unsupported system type
> "@0@"'.format(host_machine.system()))
> -endif
> +dpdk_conf.set('RTE_EXEC_ENV_' + exec_env.to_upper(), 1)
> +subdir(exec_env + '/eal')

Shouldn't this use join_paths() for cross-platform compat? Or does
foo/bar work fine these days in Windows?

Bruce Richardson April 9, 2019, 10:44 a.m. UTC | #2

On Tue, Apr 09, 2019 at 11:34:24AM +0100, Luca Boccassi wrote:
> On Tue, 2019-04-09 at 10:29 +0100, Bruce Richardson wrote:
> > Within EAL we had a series of if statements for selecting the EAL
> > directory to use. Now that the directory names match those of the OS's
> > they are for we can instead just use a generated subdirectory name,
> > shortening the code.  To avoid strange errors, we still need to check
> > for unsupported OS's, but do this check up-front in the config
> > meson.build file.
> > 
> > Signed-off-by: Bruce Richardson < bruce.richardson@intel.com
> > >
> > --- config/meson.build         |  7 +++++++ lib/librte_eal/meson.build
> > | 17 ++--------------- 2 files changed, 9 insertions(+), 15
> > deletions(-)
> > 
> > diff --git a/config/meson.build b/config/meson.build index
> > 483139b10..ce6af2595 100644 --- a/config/meson.build +++
> > b/config/meson.build @@ -1,6 +1,13 @@ # SPDX-License-Identifier:
> > BSD-3-Clause # Copyright(c) 2017-2019 Intel Corporation
> >  
> > +# check the OS is supported, rather than going any further
> > +supported_exec_envs = ['freebsd', 'linux', 'windows'] +exec_env =
> > host_machine.system() +if not supported_exec_envs.contains(exec_env) +
> > error('unsupported system type "@0@"'.format(exec_env)) +endif + # set
> > the major version, which might be used by drivers and libraries #
> > depending on the configuration options pver =
> > meson.project_version().split('.') diff --git
> > a/lib/librte_eal/meson.build b/lib/librte_eal/meson.build index
> > 1863622c0..fa36b20e0 100644 --- a/lib/librte_eal/meson.build +++
> > b/lib/librte_eal/meson.build @@ -9,21 +9,8 @@ subdir('common') #
> > defines common_sources, common_objs, etc.
> >  
> >  # Now do OS/exec-env specific settings, including building kernel
> >  modules # The <exec-env>/eal/meson.build file should define
> >  env_sources, etc.  -if host_machine.system() == 'linux' -
> >  dpdk_conf.set('RTE_EXEC_ENV_LINUX', 1) -	subdir('linux/eal') - -elif
> >  host_machine.system() == 'freebsd' -
> >  dpdk_conf.set('RTE_EXEC_ENV_FREEBSD', 1) -	subdir('freebsd/eal') -
> >  -elif host_machine.system() == 'windows' -
> >  dpdk_conf.set('RTE_EXEC_ENV_WINDOWS', 1) -	subdir('windows/eal') -
> >  -else -	error('unsupported system type
> >  "@0@"'.format(host_machine.system())) -endif
> >  +dpdk_conf.set('RTE_EXEC_ENV_' + exec_env.to_upper(), 1)
> >  +subdir(exec_env + '/eal')
> 
> Shouldn't this use join_paths() for cross-platform compat? Or does
> foo/bar work fine these days in Windows?
> 
It should work fine on Windows. We have plenty of other places where we use
"/" for separation, e.g. the subdir() function in EAL

/Bruce

Luca Boccassi April 9, 2019, 10:57 a.m. UTC | #3

On Tue, 2019-04-09 at 11:44 +0100, Bruce Richardson wrote:
> On Tue, Apr 09, 2019 at 11:34:24AM +0100, Luca Boccassi wrote:
> > On Tue, 2019-04-09 at 10:29 +0100, Bruce Richardson wrote:
> > > Within EAL we had a series of if statements for selecting the EAL
> > > directory to use. Now that the directory names match those of the
> > > OS's
> > > they are for we can instead just use a generated subdirectory
> > > name,
> > > shortening the code.  To avoid strange errors, we still need to
> > > check
> > > for unsupported OS's, but do this check up-front in the config
> > > meson.build file.
> > > 
> > > Signed-off-by: Bruce Richardson < 
> > > bruce.richardson@intel.com
> > > 
> > > 
> > > --- config/meson.build         |  7 +++++++
> > > lib/librte_eal/meson.build
> > > > 17 ++--------------- 2 files changed, 9 insertions(+), 15
> > > 
> > > deletions(-)
> > > 
> > > diff --git a/config/meson.build b/config/meson.build index
> > > 483139b10..ce6af2595 100644 --- a/config/meson.build +++
> > > b/config/meson.build @@ -1,6 +1,13 @@ # SPDX-License-Identifier:
> > > BSD-3-Clause # Copyright(c) 2017-2019 Intel Corporation
> > >  
> > > +# check the OS is supported, rather than going any further
> > > +supported_exec_envs = ['freebsd', 'linux', 'windows'] +exec_env
> > > =
> > > host_machine.system() +if not
> > > supported_exec_envs.contains(exec_env) +
> > > error('unsupported system type "@0@"'.format(exec_env)) +endif +
> > > # set
> > > the major version, which might be used by drivers and libraries #
> > > depending on the configuration options pver =
> > > meson.project_version().split('.') diff --git
> > > a/lib/librte_eal/meson.build b/lib/librte_eal/meson.build index
> > > 1863622c0..fa36b20e0 100644 --- a/lib/librte_eal/meson.build +++
> > > b/lib/librte_eal/meson.build @@ -9,21 +9,8 @@ subdir('common') #
> > > defines common_sources, common_objs, etc.
> > >  
> > >  # Now do OS/exec-env specific settings, including building
> > > kernel
> > >  modules # The <exec-env>/eal/meson.build file should define
> > >  env_sources, etc.  -if host_machine.system() == 'linux' -
> > >  dpdk_conf.set('RTE_EXEC_ENV_LINUX', 1) -	subdir('linux/eal') -
> > > -elif
> > >  host_machine.system() == 'freebsd' -
> > >  dpdk_conf.set('RTE_EXEC_ENV_FREEBSD', 1) -	subdir('freebsd
> > > /eal') -
> > >  -elif host_machine.system() == 'windows' -
> > >  dpdk_conf.set('RTE_EXEC_ENV_WINDOWS', 1) -	subdir('windows
> > > /eal') -
> > >  -else -	error('unsupported system type
> > >  "@0@"'.format(host_machine.system())) -endif
> > >  +dpdk_conf.set('RTE_EXEC_ENV_' + exec_env.to_upper(), 1)
> > >  +subdir(exec_env + '/eal')
> > 
> > Shouldn't this use join_paths() for cross-platform compat? Or does
> > foo/bar work fine these days in Windows?
> > 
> 
> It should work fine on Windows. We have plenty of other places where
> we use
> "/" for separation, e.g. the subdir() function in EAL
> 
> /Bruce

Ah, good to know!

diff mbox series

Patch

diff --git a/config/meson.build b/config/meson.build
index 483139b10..ce6af2595 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -1,6 +1,13 @@ 
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017-2019 Intel Corporation
 
+# check the OS is supported, rather than going any further
+supported_exec_envs = ['freebsd', 'linux', 'windows']
+exec_env = host_machine.system()
+if not supported_exec_envs.contains(exec_env)
+	error('unsupported system type "@0@"'.format(exec_env))
+endif
+
 # set the major version, which might be used by drivers and libraries
 # depending on the configuration options
 pver = meson.project_version().split('.')
diff --git a/lib/librte_eal/meson.build b/lib/librte_eal/meson.build
index 1863622c0..fa36b20e0 100644
--- a/lib/librte_eal/meson.build
+++ b/lib/librte_eal/meson.build
@@ -9,21 +9,8 @@  subdir('common') # defines common_sources, common_objs, etc.
 
 # Now do OS/exec-env specific settings, including building kernel modules
 # The <exec-env>/eal/meson.build file should define env_sources, etc.
-if host_machine.system() == 'linux'
-	dpdk_conf.set('RTE_EXEC_ENV_LINUX', 1)
-	subdir('linux/eal')
-
-elif host_machine.system() == 'freebsd'
-	dpdk_conf.set('RTE_EXEC_ENV_FREEBSD', 1)
-	subdir('freebsd/eal')
-
-elif host_machine.system() == 'windows'
-	dpdk_conf.set('RTE_EXEC_ENV_WINDOWS', 1)
-	subdir('windows/eal')
-
-else
-	error('unsupported system type "@0@"'.format(host_machine.system()))
-endif
+dpdk_conf.set('RTE_EXEC_ENV_' + exec_env.to_upper(), 1)
+subdir(exec_env + '/eal')
 
 version = 10  # the version of the EAL API
 allow_experimental_apis = true