From mboxrd@z Thu Jan  1 00:00:00 1970
From: Luca Boccassi <bluca@debian.org>
Subject: [PATCH v3 2/2] build: add drivers_install_subdir meson
	option
Date: Tue,  2 Oct 2018 16:25:56 +0100
Message-ID: <20181002152556.17041-2-bluca@debian.org>
References: <20180928175803.12955-1-bluca@debian.org>
 <20181002152556.17041-1-bluca@debian.org>
Mime-Version: 1.0
Content-Transfer-Encoding: 8bit
Cc: bruce.richardson@intel.com, tredaelli@redhat.com,
 christian.ehrhardt@canonical.com, mvarlese@suse.de,
 Luca Boccassi <bluca@debian.org>
To: dev@dpdk.org
Return-path: <dev-bounces@dpdk.org>
Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com
 [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id 979D15F0D
 for <dev@dpdk.org>; Tue,  2 Oct 2018 17:26:02 +0200 (CEST)
Received: by mail-wr1-f65.google.com with SMTP id n1-v6so2710103wrt.10
 for <dev@dpdk.org>; Tue, 02 Oct 2018 08:26:02 -0700 (PDT)
In-Reply-To: <20181002152556.17041-1-bluca@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>

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>
---
v3: changed default value to <VERSION> 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('<VERSION>')
+	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)
 
 # configure the build, and make sure configs here and in config folder are
diff --git a/meson_options.txt b/meson_options.txt
index d14bde892d..10b5416151 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,5 +1,7 @@
 option('allow_invalid_socket_id', type: 'boolean', value: false,
 	description: 'allow out-of-range NUMA socket id\'s for platforms that don\'t report the value correctly')
+option('drivers_install_subdir', type: 'string', value: 'dpdk/pmds-<VERSION>',
+	description: 'Subdirectory of libdir where to install PMDs. Defaults to using a versioned subdirectory.')
 option('enable_driver_mlx_glue', type: 'boolean', value: false,
 	description: 'Enable glue library for Mellanox PMDs')
 option('enable_kmods', type: 'boolean', value: true,
-- 
2.19.0