From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <luca.boccassi@gmail.com>
Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com
[209.85.128.66]) by dpdk.org (Postfix) with ESMTP id 2AE7E5F0D
for <dev@dpdk.org>; Tue, 2 Oct 2018 17:26:01 +0200 (CEST)
Received: by mail-wm1-f66.google.com with SMTP id 193-v6so2612157wme.3
for <dev@dpdk.org>; Tue, 02 Oct 2018 08:26:01 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=9dWwDVQruqP1wpxgE1yNj4TE8+nRd97dMcOtVh98gC8=;
b=RYtiK4D9rutWdeyQ0muCJtoirxfeIW5kVm3XB2uyZoxtqge/TrBixBGatFaKZW50EG
acNUNS4E5T21pGRFoTTKbDl9OPCcswWOR93PCXwsBI2A1Y+FSu1kKvC4BiXIovdHF4IH
B92aMa/qfHTWbIfvekLK9TkvxQu7WmTBUrWeKRiXDWZ+jPYrM9zBQZF7wWyjdth43rB+
UzGMgNmOjeEtw7IDBJRVzHB4AoiCWt9qKwWhetlLcmVfY+NyQc5JweNMsRpjSuLamqKX
vkIXd2ytW9/lsEMPtweXyz33dK+f7eTJBBHcg1szVr+P/vT/WY0l0ptQ7Kf7eBD8l6NF
c1sQ==
X-Gm-Message-State: ABuFfoiXVXA6TQbebBQ8lR7+17KIyQCMSK219qxBLHrs7wDWyKMrCmem
XfP7BKygkQY8D9gT+aUepz42Oz1c
X-Google-Smtp-Source: ACcGV62N34NAAMDY5xhi4rGTOLsB6mvXogzwY5hAMEe+ALfDIV9eHrW79p7vbMTMXdouBNBImi+6JQ==
X-Received: by 2002:a1c:6504:: with SMTP id
z4-v6mr2112430wmb.130.1538493960393;
Tue, 02 Oct 2018 08:26:00 -0700 (PDT)
Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556])
by smtp.gmail.com with ESMTPSA id a6-v6sm13312880wmf.22.2018.10.02.08.25.59
(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);
Tue, 02 Oct 2018 08:25:59 -0700 (PDT)
From: Luca Boccassi <bluca@debian.org>
To: dev@dpdk.org
Cc: bruce.richardson@intel.com, tredaelli@redhat.com,
christian.ehrhardt@canonical.com, mvarlese@suse.de,
Luca Boccassi <bluca@debian.org>
Date: Tue, 2 Oct 2018 16:25:55 +0100
Message-Id: <20181002152556.17041-1-bluca@debian.org>
X-Mailer: git-send-email 2.19.0
In-Reply-To: <20180928175803.12955-1-bluca@debian.org>
References: <20180928175803.12955-1-bluca@debian.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-dev] [PATCH v3 1/2] build: change default PMD installation
subdir to dpdk/pmds-XX.YY
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
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>
X-List-Received-Date: Tue, 02 Oct 2018 15:26:01 -0000
As part of the effort of consolidating the DPDK installation bits and
pieces across distros, set the default directory of lib/ where PMDs get
installed to dpdk/pmds-XX.YY. It's necessary to have a versioned
subdirectory as multiple ABI revisions might be installed at the same
time, so having a fixed name will cause trouble with the autoload
feature.
Small refactor with parsing and saving the major version to a variable,
since it's now used in 3 different places.
Signed-off-by: Luca Boccassi <bluca@debian.org>
---
drivers/meson.build | 6 ++----
lib/meson.build | 6 ++----
meson.build | 8 +++++++-
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/drivers/meson.build b/drivers/meson.build
index 47b4215a30..3a6c4bf656 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -98,10 +98,8 @@ foreach class:driver_classes
lib_version = '@0@.1'.format(version)
so_version = '@0@'.format(version)
else
- pver = meson.project_version().split('.')
- lib_version = '@0@.@1@'.format(pver.get(0),
- pver.get(1))
- so_version = lib_version
+ lib_version = major_version
+ so_version = major_version
endif
# now build the static driver
diff --git a/lib/meson.build b/lib/meson.build
index 3acc67e6ed..bed492a4ec 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -88,10 +88,8 @@ foreach l:libraries
lib_version = '@0@.1'.format(version)
so_version = '@0@'.format(version)
else
- prj_ver = meson.project_version().split('.')
- lib_version = '@0@.@1@'.format(
- prj_ver.get(0), prj_ver.get(1))
- so_version = lib_version
+ lib_version = major_version
+ so_version = major_version
endif
# first build static lib
diff --git a/meson.build b/meson.build
index c9af33532d..4bd04b9de3 100644
--- a/meson.build
+++ b/meson.build
@@ -15,7 +15,13 @@ dpdk_libraries = []
dpdk_drivers = []
dpdk_extra_ldflags = []
-driver_install_path = join_paths(get_option('libdir'), 'dpdk/drivers')
+# set the major version, which might be used by drivers and libraries
+# depending on the configuration options
+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)
eal_pmd_path = join_paths(get_option('prefix'), driver_install_path)
# configure the build, and make sure configs here and in config folder are
--
2.19.0