From 3eb485c64444b01f79c67f9a591df916056633dd Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Fri, 22 Nov 2019 18:59:59 -0800 Subject: [PATCH] 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 Reviewed-by: Ranjit Menon Tested-by: Pallavi Kadam Acked-by: Anatoly Burakov --- config/meson.build | 2 +- meson.build | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/config/meson.build b/config/meson.build index 3ffb73ab9c..364a8d7394 100644 --- 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 c5a3dda26b..b7ae9c8d9a 100644 --- 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 -- 2.20.1