From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by dpdk.org (Postfix) with ESMTP id 4505C4D3A for ; Tue, 9 Apr 2019 12:34:26 +0200 (CEST) Received: by mail-wm1-f68.google.com with SMTP id o25so2831856wmf.5 for ; Tue, 09 Apr 2019 03:34:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:subject:from:to:date:in-reply-to :references:content-transfer-encoding:user-agent:mime-version; bh=o11GKPLir4572Gyz6jCYJLEHqH0d7v0t7VM2OTjgSI4=; b=EJ9Q5ydnSx5rPL4kynhDiVPvKksmWM4DumRaAsGIB8AxkoODPxaxT+1bqRHgaB6J55 Yn1Bw0Yr2zL9/3fcBwgLn8Tpbu85RSmPNqorQS2oWPJxxSo7+EZ3iOlXlMpjbHwi2Wf9 kD1v/ioghkgvWox6UP+NgkTD3roX+boRVIh4bFNZ0+tSNCj9WTsCyaaSqJFt2IkkbxJd 7zpk3r5BrpPHN5UR5Wvv8dPk1OtjU+9TTerHmgzVXzDF35DtQHssbzYijNqysA70Z55Y TanIC7j/uAo3TQUTmqXs8qlRgXburbw39JHENJCsKRBuYdS2+fHopg6l1ZfCIzhhKnWp 87vw== X-Gm-Message-State: APjAAAVFULz12c86m3aFBrfb9FkA1HrMB5aK7DQlCXnzU1PUSimFnkU/ hNr7Xmc5nL8w9y2G7RXCtYw= X-Google-Smtp-Source: APXvYqyRcazhhnMIfqPj01PaQEdO2154YJFhLmqywVk7gxRoKLhoZsG4jC1hqDloV4GgCXAD6YWxmw== X-Received: by 2002:a1c:f205:: with SMTP id s5mr21742861wmc.124.1554806065809; Tue, 09 Apr 2019 03:34:25 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:250:b6ff:feb7:bd60]) by smtp.gmail.com with ESMTPSA id x18sm48029805wrw.14.2019.04.09.03.34.24 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 09 Apr 2019 03:34:24 -0700 (PDT) Message-ID: <15d9832ccfced85eeecb321f811df578a8dadf1c.camel@debian.org> From: Luca Boccassi To: Bruce Richardson , dev@dpdk.org Date: Tue, 09 Apr 2019 11:34:24 +0100 In-Reply-To: <20190409092933.55356-2-bruce.richardson@intel.com> References: <20190409092933.55356-1-bruce.richardson@intel.com> <20190409092933.55356-2-bruce.richardson@intel.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.30.5-1 MIME-Version: 1.0 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:34:26 -0000 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. >=20 > 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(-) >=20 > 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 > =20 > +# check the OS is supported, rather than going any further > +supported_exec_envs =3D ['freebsd', 'linux', 'windows'] > +exec_env =3D 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 =3D 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. > =20 > # 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() =3D=3D 'linux' > - dpdk_conf.set('RTE_EXEC_ENV_LINUX', 1) > - subdir('linux/eal') > - > -elif host_machine.system() =3D=3D 'freebsd' > - dpdk_conf.set('RTE_EXEC_ENV_FREEBSD', 1) > - subdir('freebsd/eal') > - > -elif host_machine.system() =3D=3D '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? --=20 Kind regards, Luca Boccassi 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 E61FCA0096 for ; Tue, 9 Apr 2019 12:34:27 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 699EB4F93; Tue, 9 Apr 2019 12:34:27 +0200 (CEST) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by dpdk.org (Postfix) with ESMTP id 4505C4D3A for ; Tue, 9 Apr 2019 12:34:26 +0200 (CEST) Received: by mail-wm1-f68.google.com with SMTP id o25so2831856wmf.5 for ; Tue, 09 Apr 2019 03:34:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:subject:from:to:date:in-reply-to :references:content-transfer-encoding:user-agent:mime-version; bh=o11GKPLir4572Gyz6jCYJLEHqH0d7v0t7VM2OTjgSI4=; b=EJ9Q5ydnSx5rPL4kynhDiVPvKksmWM4DumRaAsGIB8AxkoODPxaxT+1bqRHgaB6J55 Yn1Bw0Yr2zL9/3fcBwgLn8Tpbu85RSmPNqorQS2oWPJxxSo7+EZ3iOlXlMpjbHwi2Wf9 kD1v/ioghkgvWox6UP+NgkTD3roX+boRVIh4bFNZ0+tSNCj9WTsCyaaSqJFt2IkkbxJd 7zpk3r5BrpPHN5UR5Wvv8dPk1OtjU+9TTerHmgzVXzDF35DtQHssbzYijNqysA70Z55Y TanIC7j/uAo3TQUTmqXs8qlRgXburbw39JHENJCsKRBuYdS2+fHopg6l1ZfCIzhhKnWp 87vw== X-Gm-Message-State: APjAAAVFULz12c86m3aFBrfb9FkA1HrMB5aK7DQlCXnzU1PUSimFnkU/ hNr7Xmc5nL8w9y2G7RXCtYw= X-Google-Smtp-Source: APXvYqyRcazhhnMIfqPj01PaQEdO2154YJFhLmqywVk7gxRoKLhoZsG4jC1hqDloV4GgCXAD6YWxmw== X-Received: by 2002:a1c:f205:: with SMTP id s5mr21742861wmc.124.1554806065809; Tue, 09 Apr 2019 03:34:25 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:250:b6ff:feb7:bd60]) by smtp.gmail.com with ESMTPSA id x18sm48029805wrw.14.2019.04.09.03.34.24 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 09 Apr 2019 03:34:24 -0700 (PDT) Message-ID: <15d9832ccfced85eeecb321f811df578a8dadf1c.camel@debian.org> From: Luca Boccassi To: Bruce Richardson , dev@dpdk.org Date: Tue, 09 Apr 2019 11:34:24 +0100 In-Reply-To: <20190409092933.55356-2-bruce.richardson@intel.com> References: <20190409092933.55356-1-bruce.richardson@intel.com> <20190409092933.55356-2-bruce.richardson@intel.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.30.5-1 MIME-Version: 1.0 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: <20190409103424.yE4B6CBRQdJus_a4S2YNPb8P52wwdVRx2Py_BnJoHfA@z> 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. >=20 > 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(-) >=20 > 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 > =20 > +# check the OS is supported, rather than going any further > +supported_exec_envs =3D ['freebsd', 'linux', 'windows'] > +exec_env =3D 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 =3D 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. > =20 > # 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() =3D=3D 'linux' > - dpdk_conf.set('RTE_EXEC_ENV_LINUX', 1) > - subdir('linux/eal') > - > -elif host_machine.system() =3D=3D 'freebsd' > - dpdk_conf.set('RTE_EXEC_ENV_FREEBSD', 1) > - subdir('freebsd/eal') > - > -elif host_machine.system() =3D=3D '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? --=20 Kind regards, Luca Boccassi