From mboxrd@z Thu Jan  1 00:00:00 1970
From: Luca Boccassi <bluca@debian.org>
Subject: Re: [PATCH v3 2/2] build: add drivers_install_subdir
	meson option
Date: Tue, 02 Oct 2018 17:21:09 +0100
Message-ID: <1538497269.4835.12.camel@debian.org>
References: <20180928175803.12955-1-bluca@debian.org>
 <20181002152556.17041-1-bluca@debian.org>
 <20181002152556.17041-2-bluca@debian.org>
 <20181002155857.GA24088@bricha3-MOBL.ger.corp.intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Cc: dev@dpdk.org, tredaelli@redhat.com, christian.ehrhardt@canonical.com,
 mvarlese@suse.de
To: Bruce Richardson <bruce.richardson@intel.com>
Return-path: <dev-bounces@dpdk.org>
Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com
 [209.85.128.66]) by dpdk.org (Postfix) with ESMTP id 40AA37EE3
 for <dev@dpdk.org>; Tue,  2 Oct 2018 18:21:12 +0200 (CEST)
Received: by mail-wm1-f66.google.com with SMTP id b19-v6so2879873wme.3
 for <dev@dpdk.org>; Tue, 02 Oct 2018 09:21:12 -0700 (PDT)
In-Reply-To: <20181002155857.GA24088@bricha3-MOBL.ger.corp.intel.com>
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>

On Tue, 2018-10-02 at 16:58 +0100, Bruce Richardson wrote:
> On Tue, Oct 02, 2018 at 04:25:56PM +0100, Luca Boccassi wrote:
> > Allow users and packagers to override the default dpdk/drivers
> > subdirectory where the PMDs get installed under $lib.
> >=20
> > Signed-off-by: Luca Boccassi <bluca@debian.org>
> > ---
> > v3: changed default value to <VERSION> and use string.contains
> > rather
> > =C2=A0=C2=A0=C2=A0=C2=A0than exact equivalence
> >=20
> > =C2=A0meson.build=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0| 10 +++++++=
+--
> > =C2=A0meson_options.txt |=C2=A0=C2=A02 ++
> > =C2=A02 files changed, 10 insertions(+), 2 deletions(-)
> >=20
> > diff --git a/meson.build b/meson.build
> > index 4bd04b9de3..2e3cbac587 100644
> > --- a/meson.build
> > +++ b/meson.build
> > @@ -20,8 +20,14 @@ dpdk_extra_ldflags =3D []
> > =C2=A0pver =3D meson.project_version().split('.')
> > =C2=A0major_version =3D '@0@.@1@'.format(pver.get(0), pver.get(1))
> > =C2=A0
> > -driver_install_path =3D join_paths(get_option('libdir'), 'dpdk',
> > -	'pmds-' + major_version)
> > +pmd_subdir_opt =3D get_option('drivers_install_subdir')
> > +if pmd_subdir_opt.contains('<VERSION>')
> > +	driver_install_path =3D join_paths(get_option('libdir'),
> > +		'dpdk', 'pmds-' + major_version)
> > +else
> > +	driver_install_path =3D join_paths(get_option('libdir'),
> > +		pmd_subdir_opt)
> > +endif
> > =C2=A0eal_pmd_path =3D join_paths(get_option('prefix'),
> > driver_install_path)
> > =C2=A0
>=20
> The diff (to your patch) below demonstrates more of what I had in
> mind :-)
> Basically do a replace of '<VERSION>' with the version number,
> leaving the
> remaining string unchanged.
>=20
> /Bruce
>=20
> diff --git a/meson.build b/meson.build
> index 2e3cbac58..11697861c 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -22,12 +22,9 @@ major_version =3D '@0@.@1@'.format(pver.get(0),
> pver.get(1))
> =C2=A0
> =C2=A0pmd_subdir_opt =3D get_option('drivers_install_subdir')
> =C2=A0if pmd_subdir_opt.contains('<VERSION>')
> -	driver_install_path =3D join_paths(get_option('libdir'),
> -		'dpdk', 'pmds-' + major_version)
> -else
> -	driver_install_path =3D join_paths(get_option('libdir'),
> -		pmd_subdir_opt)
> +	pmd_subdir_opt =3D
> major_version.join(pmd_subdir_opt.split('<VERSION>'))
> =C2=A0endif
> +driver_install_path =3D join_paths(get_option('libdir'),
> pmd_subdir_opt)
> =C2=A0eal_pmd_path =3D join_paths(get_option('prefix'), driver_install_pa=
th)
> =C2=A0
> =C2=A0# configure the build, and make sure configs here and in config
> folder are

Ok, pushed in v4

--=20
Kind regards,
Luca Boccassi