[dpdk-dev] [PATCH v3 2/4] build: move meson version handling to config directory
Bruce Richardson
bruce.richardson at intel.com
Fri Mar 15 19:20:20 CET 2019
To keep the top-level meson.build file as clean and clear as possible, we
move the version handling to the config/meson.build file, where the rest of
the build configuration is already being set up.
Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: Luca Boccassi <bluca at debian.org>
---
V3: Reordered patch in set
V2: No changes, added Luca's ack
---
config/meson.build | 12 ++++++++++++
meson.build | 12 ------------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/config/meson.build b/config/meson.build
index 0419607d3..999dea91e 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -1,6 +1,18 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation
+# 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 at .@1@'.format(pver.get(0), pver.get(1))
+
+pmd_subdir_opt = get_option('drivers_install_subdir')
+if pmd_subdir_opt.contains('<VERSION>')
+ pmd_subdir_opt = major_version.join(pmd_subdir_opt.split('<VERSION>'))
+endif
+driver_install_path = join_paths(get_option('libdir'), pmd_subdir_opt)
+eal_pmd_path = join_paths(get_option('prefix'), driver_install_path)
+
# set the machine type and cflags for it
if meson.is_cross_build()
machine = host_machine.cpu()
diff --git a/meson.build b/meson.build
index 1b31e0da5..6a83c827e 100644
--- a/meson.build
+++ b/meson.build
@@ -19,18 +19,6 @@ dpdk_drivers = []
dpdk_extra_ldflags = []
dpdk_app_link_libraries = []
-# 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 at .@1@'.format(pver.get(0), pver.get(1))
-
-pmd_subdir_opt = get_option('drivers_install_subdir')
-if pmd_subdir_opt.contains('<VERSION>')
- pmd_subdir_opt = major_version.join(pmd_subdir_opt.split('<VERSION>'))
-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
# able to be included in any file. We also store a global array of include dirs
# for passing to pmdinfogen scripts
--
2.20.1
More information about the dev
mailing list