From 6b782e6d7e374d14a6e19ec14b2bf8fd32b72b84 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Thu, 10 Nov 2022 01:18:22 +0100 Subject: [PATCH] ucx: fix int overflow: use ssize_t (#33784) --- .../builtin/packages/ucx/commit-2523555.patch | 31 +++++++++++++++++++ .../repos/builtin/packages/ucx/package.py | 3 ++ 2 files changed, 34 insertions(+) create mode 100644 var/spack/repos/builtin/packages/ucx/commit-2523555.patch diff --git a/var/spack/repos/builtin/packages/ucx/commit-2523555.patch b/var/spack/repos/builtin/packages/ucx/commit-2523555.patch new file mode 100644 index 0000000000..01056202fb --- /dev/null +++ b/var/spack/repos/builtin/packages/ucx/commit-2523555.patch @@ -0,0 +1,31 @@ +From 38e5b912dd737b5673ea34f885fe6222276a6f9f Mon Sep 17 00:00:00 2001 +From: Sergey Oblomov +Date: Fri, 14 Oct 2022 12:15:11 +0300 +Subject: [PATCH] IB/MD: fixed build on SLES SP3 + +--- + src/uct/ib/base/ib_md.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/uct/ib/base/ib_md.c b/src/uct/ib/base/ib_md.c +index 225d1de9234..1618f35c03d 100644 +--- a/src/uct/ib/base/ib_md.c ++++ b/src/uct/ib/base/ib_md.c +@@ -2059,7 +2059,7 @@ uct_component_t uct_ib_component = { + + void UCS_F_CTOR uct_ib_init() + { +- int i; ++ ssize_t i; + + uct_component_register(&uct_ib_component); + +@@ -2070,7 +2070,7 @@ void UCS_F_CTOR uct_ib_init() + + void UCS_F_DTOR uct_ib_cleanup() + { +- int i; ++ ssize_t i; + + for (i = ucs_static_array_size(uct_ib_tls) - 1; i >= 0; i--) { + uct_tl_unregister(uct_ib_tls[i]); diff --git a/var/spack/repos/builtin/packages/ucx/package.py b/var/spack/repos/builtin/packages/ucx/package.py index a9512ec7c3..84d301518e 100644 --- a/var/spack/repos/builtin/packages/ucx/package.py +++ b/var/spack/repos/builtin/packages/ucx/package.py @@ -132,6 +132,9 @@ class Ucx(AutotoolsPackage, CudaPackage): configure_abs_path = "contrib/configure-release" + # See https://github.com/openucx/ucx/pull/8629, wrong int type + patch("commit-2523555.patch", when="@1.13.1") + @when("@1.9-dev") def autoreconf(self, spec, prefix): Executable("./autogen.sh")()