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 E29545F19 for ; Tue, 2 Oct 2018 18:00:04 +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; 02 Oct 2018 09:00:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,332,1534834800"; d="scan'208";a="74817735" Received: from bricha3-mobl.ger.corp.intel.com ([10.237.221.107]) by fmsmga007.fm.intel.com with SMTP; 02 Oct 2018 08:58:58 -0700 Received: by (sSMTP sendmail emulation); Tue, 02 Oct 2018 16:58:58 +0100 Date: Tue, 2 Oct 2018 16:58:57 +0100 From: Bruce Richardson To: Luca Boccassi Cc: dev@dpdk.org, tredaelli@redhat.com, christian.ehrhardt@canonical.com, mvarlese@suse.de Message-ID: <20181002155857.GA24088@bricha3-MOBL.ger.corp.intel.com> References: <20180928175803.12955-1-bluca@debian.org> <20181002152556.17041-1-bluca@debian.org> <20181002152556.17041-2-bluca@debian.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20181002152556.17041-2-bluca@debian.org> Organization: Intel Research and Development Ireland Ltd. User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [dpdk-dev] [PATCH v3 2/2] build: add drivers_install_subdir meson option 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, 02 Oct 2018 16:00:05 -0000 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. > > Signed-off-by: Luca Boccassi > --- > v3: changed default value to and use string.contains rather > than exact equivalence > > meson.build | 10 ++++++++-- > meson_options.txt | 2 ++ > 2 files changed, 10 insertions(+), 2 deletions(-) > > 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 = [] > 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.contains('') > + 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 > eal_pmd_path = join_paths(get_option('prefix'), driver_install_path) > The diff (to your patch) below demonstrates more of what I had in mind :-) Basically do a replace of '' with the version number, leaving the remaining string unchanged. /Bruce diff --git a/meson.build b/meson.build index 2e3cbac58..11697861c 100644 --- a/meson.build +++ b/meson.build @@ -22,12 +22,9 @@ major_version = '@0@.@1@'.format(pver.get(0), pver.get(1)) pmd_subdir_opt = get_option('drivers_install_subdir') if pmd_subdir_opt.contains('') - driver_install_path = join_paths(get_option('libdir'), - 'dpdk', 'pmds-' + major_version) -else - driver_install_path = join_paths(get_option('libdir'), - pmd_subdir_opt) + pmd_subdir_opt = major_version.join(pmd_subdir_opt.split('')) endif +driver_install_path = join_paths(get_option('libdir'), pmd_subdir_opt) eal_pmd_path = join_paths(get_option('prefix'), driver_install_path) # configure the build, and make sure configs here and in config folder are