Skip to contentSkip to conversation

build: fix windows build failure for 19.11

PATCH In review Pallavi Kadam 4 participants 5 messages Nov 23, 2019 – Nov 25, 2019 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 build: fix windows build failure for 19.11

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.

---
 config/meson.build | 2 +-
 meson.build        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
config/meson.build +1 -1
index 3ffb73ab9..364a8d739 100644
@@ -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))
meson.build +1 -0
index c5a3dda26..b7ae9c8d9 100644
@@ -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
Signature · 1 line
2.18.0.windows.1
#1 lore raw
Quoted 2 lines · Pallavi Kadam

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.

Quoted 6 lines

This patch can be merged in 19.11 release.

---

Acked-by on v1 1/1
#2 lore raw
In reply to Pallavi Kadam
Quoted 8 lines · Pallavi Kadam

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.

---

Missing Fixes: tag

Signature · 2 lines
Thanks,
Anatoly
#3 lore raw
Quoted 6 lines · Anatoly
Quoted 4 lines · Pallavi Kadam

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.

Quoted 8 lines
Quoted 4 lines

---

Missing Fixes: tag

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.

Signature · 1 line
David Marchand
#4 lore raw

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")
Quoted 4 lines
Quoted 4 lines
Quoted 3 lines

Thanks.

--
David Marchand