From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 7C4714F93 for ; Tue, 9 Apr 2019 12:44:03 +0200 (CEST) X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Apr 2019 03:44:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,329,1549958400"; d="scan'208";a="141267783" Received: from bricha3-mobl.ger.corp.intel.com ([10.237.221.35]) by fmsmga007.fm.intel.com with SMTP; 09 Apr 2019 03:44:00 -0700 Received: by (sSMTP sendmail emulation); Tue, 09 Apr 2019 11:44:00 +0100 Date: Tue, 9 Apr 2019 11:44:00 +0100 From: Bruce Richardson To: Luca Boccassi Cc: dev@dpdk.org Message-ID: <20190409104359.GB671@bricha3-MOBL.ger.corp.intel.com> References: <20190409092933.55356-1-bruce.richardson@intel.com> <20190409092933.55356-2-bruce.richardson@intel.com> <15d9832ccfced85eeecb321f811df578a8dadf1c.camel@debian.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <15d9832ccfced85eeecb321f811df578a8dadf1c.camel@debian.org> User-Agent: Mutt/1.11.4 (2019-03-13) Subject: Re: [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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Apr 2019 10:44:04 -0000 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 /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 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 9A343A0096 for ; Tue, 9 Apr 2019 12:44:06 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 533784F94; Tue, 9 Apr 2019 12:44:05 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 7C4714F93 for ; Tue, 9 Apr 2019 12:44:03 +0200 (CEST) X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Apr 2019 03:44:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,329,1549958400"; d="scan'208";a="141267783" Received: from bricha3-mobl.ger.corp.intel.com ([10.237.221.35]) by fmsmga007.fm.intel.com with SMTP; 09 Apr 2019 03:44:00 -0700 Received: by (sSMTP sendmail emulation); Tue, 09 Apr 2019 11:44:00 +0100 Date: Tue, 9 Apr 2019 11:44:00 +0100 From: Bruce Richardson To: Luca Boccassi Cc: dev@dpdk.org Message-ID: <20190409104359.GB671@bricha3-MOBL.ger.corp.intel.com> References: <20190409092933.55356-1-bruce.richardson@intel.com> <20190409092933.55356-2-bruce.richardson@intel.com> <15d9832ccfced85eeecb321f811df578a8dadf1c.camel@debian.org> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline In-Reply-To: <15d9832ccfced85eeecb321f811df578a8dadf1c.camel@debian.org> User-Agent: Mutt/1.11.4 (2019-03-13) Subject: Re: [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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Message-ID: <20190409104400.WGU1wWByub-JXksQx6rjwPkBONFghWM0fsK7vOWiEBQ@z> 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 /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