build: fix Windows build

While most windows apps can handle both "\" and "/" as path separators,
"more" is treating the "/" as the start of a command-line flag in this
case, causing errors.

Fixes: cba806e07d6f ("build: change ABI versioning to global")
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Reviewed-by: Ranjit Menon <ranjit.menon@intel.com>
Tested-by: Pallavi Kadam <pallavi.kadam@intel.com>
Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>

diff --git a/config/meson.build b/config/meson.build
index 3ffb73ab9cf5af9081ab2b91d95f80d9c6e164d3..364a8d739467838080e9a62ed97d42ea7eef6d6f 100644 (file)
--- a/config/meson.build
+++ b/config/meson.build
@@ -19,7 +19,7 @@ endforeach
 pver = meson.project_version().split('.')
 major_version = '@0@.@1@'.format(pver.get(0), pver.get(1))
 abi_version = run_command(find_program('cat', 'more'),
-       files('../ABI_VERSION')).stdout().strip()
+       abi_version_file).stdout().strip()
 # experimental libraries are versioned as 0.majorminor versions, e.g. 0.201
 ever = abi_version.split('.')
 experimental_abi_version = '0.@0@@1@'.format(ever.get(0), ever.get(1))

diff --git a/meson.build b/meson.build
index c5a3dda26bdcb505d73d635e00d5817aa9ad86c4..b7ae9c8d9aeef46d4e4888335e146cb8f6693dc3 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -22,6 +22,7 @@ dpdk_extra_ldflags = []
 dpdk_app_link_libraries = []
 dpdk_libs_disabled = []
 dpdk_drvs_disabled = []
+abi_version_file = files('ABI_VERSION')
 
 # 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