From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id 506E52BD8 for ; Tue, 9 Apr 2019 12:55:56 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Apr 2019 03:55:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,329,1549958400"; d="scan'208";a="160043782" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.222.236]) by fmsmga004.fm.intel.com with ESMTP; 09 Apr 2019 03:55:54 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: bluca@debian.org, david.marchand@redhat.com, Bruce Richardson Date: Tue, 9 Apr 2019 11:55:35 +0100 Message-Id: <20190409105539.61460-2-bruce.richardson@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190409105539.61460-1-bruce.richardson@intel.com> References: <20190409105539.61460-1-bruce.richardson@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v2 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 10:55:56 -0000 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 Reviewed-by: David Marchand --- 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 /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 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 43EFEA0096 for ; Tue, 9 Apr 2019 12:56:01 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E287A5398; Tue, 9 Apr 2019 12:55:57 +0200 (CEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id 506E52BD8 for ; Tue, 9 Apr 2019 12:55:56 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Apr 2019 03:55:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,329,1549958400"; d="scan'208";a="160043782" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.222.236]) by fmsmga004.fm.intel.com with ESMTP; 09 Apr 2019 03:55:54 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: bluca@debian.org, david.marchand@redhat.com, Bruce Richardson Date: Tue, 9 Apr 2019 11:55:35 +0100 Message-Id: <20190409105539.61460-2-bruce.richardson@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190409105539.61460-1-bruce.richardson@intel.com> References: <20190409105539.61460-1-bruce.richardson@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v2 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Content-Type: text/plain; charset="UTF-8" Message-ID: <20190409105535.CwvQuSrzIGQTrIEJ6ApH8yOP7tvyj8BSd5Qq_ulVs54@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 Reviewed-by: David Marchand --- 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 /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