DPDK patches and discussions
 help / color / mirror / Atom feed
From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: Bruce Richardson <bruce.richardson@intel.com>
Subject: [dpdk-dev] [PATCH 1/5] build: simplify subdirectory detection for EAL
Date: Tue,  9 Apr 2019 10:29:29 +0100	[thread overview]
Message-ID: <20190409092933.55356-2-bruce.richardson@intel.com> (raw)
In-Reply-To: <20190409092933.55356-1-bruce.richardson@intel.com>

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')
 
 version = 10  # the version of the EAL API
 allow_experimental_apis = true
-- 
2.20.1

  parent reply	other threads:[~2019-04-09  9:29 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-09  9:29 [dpdk-dev] [PATCH 0/5] small cleanup and fixes Bruce Richardson
2019-04-09  9:29 ` Bruce Richardson
2019-04-09  9:29 ` Bruce Richardson [this message]
2019-04-09  9:29   ` [dpdk-dev] [PATCH 1/5] build: simplify subdirectory detection for EAL Bruce Richardson
2019-04-09 10:34   ` Luca Boccassi
2019-04-09 10:34     ` Luca Boccassi
2019-04-09 10:44     ` Bruce Richardson
2019-04-09 10:44       ` Bruce Richardson
2019-04-09 10:57       ` Luca Boccassi
2019-04-09 10:57         ` Luca Boccassi
2019-04-09  9:29 ` [dpdk-dev] [PATCH 2/5] build: increase readability via shortcut variables Bruce Richardson
2019-04-09  9:29   ` Bruce Richardson
2019-04-09 10:35   ` Luca Boccassi
2019-04-09 10:35     ` Luca Boccassi
2019-04-09  9:29 ` [dpdk-dev] [PATCH 3/5] distributor: skip building if power library not found Bruce Richardson
2019-04-09  9:29   ` Bruce Richardson
2019-04-09  9:37   ` Hunt, David
2019-04-09  9:37     ` Hunt, David
2019-04-09 10:36   ` Luca Boccassi
2019-04-09 10:36     ` Luca Boccassi
2019-04-09  9:29 ` [dpdk-dev] [PATCH 4/5] examples/l2fwd-cat: fix build on FreeBSD Bruce Richardson
2019-04-09  9:29   ` Bruce Richardson
2019-04-09  9:56   ` David Marchand
2019-04-09  9:56     ` David Marchand
2019-04-09 10:03     ` Bruce Richardson
2019-04-09 10:03       ` Bruce Richardson
2019-04-09 10:34       ` David Marchand
2019-04-09 10:34         ` David Marchand
2019-04-09 10:40         ` Bruce Richardson
2019-04-09 10:40           ` Bruce Richardson
2019-04-09 10:40         ` [dpdk-dev] [dpdk-stable] " Luca Boccassi
2019-04-09 10:40           ` Luca Boccassi
2019-04-09 11:09           ` David Marchand
2019-04-09 11:09             ` David Marchand
2019-04-09 10:40   ` [dpdk-dev] " Luca Boccassi
2019-04-09 10:40     ` Luca Boccassi
2019-04-09  9:29 ` [dpdk-dev] [PATCH 5/5] devtools/test-meson-builds: fix support for FreeBSD Bruce Richardson
2019-04-09  9:29   ` Bruce Richardson
2019-04-09  9:57   ` David Marchand
2019-04-09  9:57     ` David Marchand
2019-04-09 10:02     ` Bruce Richardson
2019-04-09 10:02       ` Bruce Richardson
2019-04-09 10:37   ` Luca Boccassi
2019-04-09 10:37     ` Luca Boccassi
2019-04-09  9:55 ` [dpdk-dev] [PATCH 0/5] small cleanup and fixes David Marchand
2019-04-09  9:55   ` David Marchand

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=20190409092933.55356-2-bruce.richardson@intel.com \
    --to=bruce.richardson@intel.com \
    --cc=dev@dpdk.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;
as well as URLs for NNTP newsgroup(s).