[dpdk-dev] [PATCH] build: fix windows build failure for 19.11
Pallavi Kadam
pallavi.kadam at intel.com
Sat Nov 23 03:59:59 CET 2019
This patch fixes Windows build failure caused due to
'config: change ABI versioning to global' patch.
This patch can be merged in 19.11 release.
Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
Reviewed-by: Ranjit Menon <ranjit.menon at intel.com>
Tested-by: Pallavi Kadam <pallavi.kadam at intel.com>
---
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 3ffb73ab9..364a8d739 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -19,7 +19,7 @@ endforeach
pver = meson.project_version().split('.')
major_version = '@0 at .@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. at 0@@1@'.format(ever.get(0), ever.get(1))
diff --git a/meson.build b/meson.build
index c5a3dda26..b7ae9c8d9 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.18.0.windows.1
More information about the dev
mailing list