summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Richardson <bruce.richardson@intel.com>2019-11-22 18:59:59 -0800
committerDavid Marchand <david.marchand@redhat.com>2019-11-25 15:07:02 +0100
commitbcececf9585f5bf2f5a0656f12eccad8a5f976fe (patch)
treeafba4bca99e024382816a2029271df29ad2a6307
parentc143928d8977f9d118078a0e6545d9058bbdbe52 (diff)
downloaddpdk-next-net-intel-bcececf9585f5bf2f5a0656f12eccad8a5f976fe.zip
dpdk-next-net-intel-bcececf9585f5bf2f5a0656f12eccad8a5f976fe.tar.gz
dpdk-next-net-intel-bcececf9585f5bf2f5a0656f12eccad8a5f976fe.tar.xz
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>
-rw-r--r--config/meson.build2
-rw-r--r--meson.build1
2 files changed, 2 insertions, 1 deletions
diff --git a/config/meson.build b/config/meson.build
index 3ffb73a..364a8d7 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 c5a3dda..b7ae9c8 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