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@intel.com> Reviewed-by: Ranjit Menon <ranjit.menon@intel.com> Tested-by: Pallavi Kadam <pallavi.kadam@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@.@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 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
On Fri, Nov 22, 2019 at 06:59:59PM -0800, Pallavi Kadam wrote: > This patch fixes Windows build failure caused due to > 'config: change ABI versioning to global' patch. Underlying reason is: "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. > This patch can be merged in 19.11 release. > > 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> > ---
On 23-Nov-19 2:59 AM, Pallavi Kadam wrote:
> 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@intel.com>
> Reviewed-by: Ranjit Menon <ranjit.menon@intel.com>
> Tested-by: Pallavi Kadam <pallavi.kadam@intel.com>
> ---
Missing Fixes: tag
Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>
--
Thanks,
Anatoly
On Mon, Nov 25, 2019 at 2:06 PM Burakov, Anatoly
<anatoly.burakov@intel.com> wrote:
>
> On 23-Nov-19 2:59 AM, Pallavi Kadam wrote:
> > 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@intel.com>
> > Reviewed-by: Ranjit Menon <ranjit.menon@intel.com>
> > Tested-by: Pallavi Kadam <pallavi.kadam@intel.com>
> > ---
>
> Missing Fixes: tag
>
> Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>
Who is the author of this patch?
If Pallavi authored it, we are missing a sob.
Can you just clarify this?
Then I can fix the commitlog and apply this patch.
--
David Marchand
Confirmed author with Bruce offlist.
Applied with commitlog proposed by Bruce:
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>
Thanks.
--
David Marchand