From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by dpdk.space (Postfix) with ESMTP id 35618A0096
for <public@inbox.dpdk.org>; Tue, 9 Apr 2019 11:29:47 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 8EFD55B40;
Tue, 9 Apr 2019 11:29:43 +0200 (CEST)
Received: from mga09.intel.com (mga09.intel.com [134.134.136.24])
by dpdk.org (Postfix) with ESMTP id 27BF35B3E
for <dev@dpdk.org>; Tue, 9 Apr 2019 11:29:41 +0200 (CEST)
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
Received: from fmsmga002.fm.intel.com ([10.253.24.26])
by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;
09 Apr 2019 02:29:41 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.60,328,1549958400"; d="scan'208";a="159524374"
Received: from silpixa00399126.ir.intel.com (HELO
silpixa00399126.ger.corp.intel.com) ([10.237.222.236])
by fmsmga002.fm.intel.com with ESMTP; 09 Apr 2019 02:29:40 -0700
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>
X-Mailer: git-send-email 2.20.1
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
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
Content-Type: text/plain; charset="UTF-8"
Message-ID: <20190409092929.UeKdcokwS215t3KJTDhGj7q3JCqBamBx9Wm2XCo3rwE@z>
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