From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bruce Richardson <bruce.richardson@intel.com>
Subject: Re: [PATCH v2 2/2] build: add drivers_install_subdir
	meson option
Date: Tue, 2 Oct 2018 16:19:50 +0100
Message-ID: <20181002151950.GB13012@bricha3-MOBL.ger.corp.intel.com>
References: <20180928175803.12955-1-bluca@debian.org>
 <20181002130646.14919-1-bluca@debian.org>
 <20181002130646.14919-2-bluca@debian.org>
 <20181002142805.GA13012@bricha3-MOBL.ger.corp.intel.com>
 <1538492388.4835.6.camel@debian.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: 8bit
Cc: dev@dpdk.org, tredaelli@redhat.com, christian.ehrhardt@canonical.com,
 mvarlese@suse.de
To: Luca Boccassi <bluca@debian.org>
Return-path: <dev-bounces@dpdk.org>
Received: from mga14.intel.com (mga14.intel.com [192.55.52.115])
 by dpdk.org (Postfix) with ESMTP id B7EF85F0D
 for <dev@dpdk.org>; Tue,  2 Oct 2018 17:19:55 +0200 (CEST)
Content-Disposition: inline
In-Reply-To: <1538492388.4835.6.camel@debian.org>
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, Oct 02, 2018 at 03:59:48PM +0100, Luca Boccassi wrote:
> On Tue, 2018-10-02 at 15:28 +0100, Bruce Richardson wrote:
> > On Tue, Oct 02, 2018 at 02:06:46PM +0100, Luca Boccassi wrote:
> > > Allow users and packagers to override the default dpdk/drivers
> > > subdirectory where the PMDs get installed under $lib.
> > > 
> > > Signed-off-by: Luca Boccassi <bluca@debian.org>
> > > ---
> > >  meson.build       | 10 ++++++++--
> > >  meson_options.txt |  2 ++
> > >  2 files changed, 10 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/meson.build b/meson.build
> > > index 4bd04b9de3..9f7f17f7fe 100644
> > > --- a/meson.build
> > > +++ b/meson.build
> > > @@ -20,8 +20,14 @@ dpdk_extra_ldflags = []
> > >  pver = meson.project_version().split('.')
> > >  major_version = '@0@.@1@'.format(pver.get(0), pver.get(1))
> > >  
> > > -driver_install_path = join_paths(get_option('libdir'), 'dpdk',
> > > -	'pmds-' + major_version)
> > > +pmd_subdir_opt = get_option('drivers_install_subdir')
> > > +if pmd_subdir_opt == 'dpdk/pmds-XX.YY'
> > > +	driver_install_path = join_paths(get_option('libdir'),
> > > +		'dpdk', 'pmds-' + major_version)
> > > +else
> > > +	driver_install_path = join_paths(get_option('libdir'),
> > > +		pmd_subdir_opt)
> > > +endif
> > 
> > Not sure I like this degree of hard-coding of paths. While meson
> > doesn't
> > have a string replace function, we can still use "sed" via
> > run_command to
> > perform some substitution, or else get a little creative using split
> > if it
> > can be made work. That would allow us to put in e.g "<VERSION>" as a
> > generic placeholder in the text.
> > 
> > /Bruce
> 
> Do you mean for the "if pmd_subdir_opt == 'dpdk/pmds-XX.YY'" bit? I can
> change that to "== 'dpdk/pmds-<VERSION>'" if you prefer?
> 

Yes, though I was more thinking of:
	 "if pmd_subdir_opt.contains('<VERSION>')" ...
rather than matching on the whole string.

/Bruce