From caf2d5c87687919f9e3cc8093d98aff54d21f6e19e7cece9b108be03ef3c8f3b Mon Sep 17 00:00:00 2001
From: Nicolas Morey <nmorey@suse.com>
Date: Mon, 3 Nov 2025 18:46:42 +0100
Subject: [PATCH 1/3] Use external hwloc

Signed-off-by: Nicolas Morey <nmorey@suse.com>
---
 mpich.changes | 5 +++++
 mpich.spec    | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/mpich.changes b/mpich.changes
index 2aed6ed..5fff4d9 100644
--- a/mpich.changes
+++ b/mpich.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Nov  4 17:54:18 UTC 2025 - Nicolas Morey <nicolas.morey@suse.com>
+
+- Use external hwloc
+
 -------------------------------------------------------------------
 Tue Oct 28 17:54:04 UTC 2025 - Nicolas Morey <nicolas.morey@suse.com>
 
diff --git a/mpich.spec b/mpich.spec
index 9513b1a..77b39ef 100644
--- a/mpich.spec
+++ b/mpich.spec
@@ -101,6 +101,7 @@ BuildRequires:  libtool
 BuildRequires:  libtool
 BuildRequires:  mpi-selector
 BuildRequires:  python3-devel
+BuildRequires:  hwloc-devel >= 2.0
 
 %if "%{build_flavor}" == "ofi"
 BuildRequires:  libfabric-devel
@@ -114,7 +115,6 @@ BuildRequires:  libuct-devel >= 1.7.0
 # UCX is only available for 64b archs
 ExcludeArch:    %ix86 %arm
 %endif
-
 Provides:       mpi
 BuildRequires:  Modules
 BuildRequires:  gcc-c++
@@ -205,6 +205,7 @@ export FCFLAGS="-fallow-argument-mismatch $FCFLAGS"
     --sysconfdir=%{p_sysconfdir} \
     --disable-rpath      \
     --disable-wrapper-rpath      \
+    --with-hwloc \
 %if "%{build_flavor}" == "ofi"
    --with-ofi \
    --with-device=ch4:ofi \
-- 
2.51.1


From 323ae9025795a69d158324f38319527c627ecfb300e066501fb5aa239d6c2298 Mon Sep 17 00:00:00 2001
From: Nicolas Morey <nmorey@suse.com>
Date: Tue, 4 Nov 2025 19:03:23 +0100
Subject: [PATCH 2/3] Rename standard multibuild flavor to ucx for more clarity

Signed-off-by: Nicolas Morey <nmorey@suse.com>
---
 _multibuild   | 4 ++--
 mpich.changes | 1 +
 mpich.spec    | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/_multibuild b/_multibuild
index 606536d..a8e6772 100644
--- a/_multibuild
+++ b/_multibuild
@@ -1,6 +1,6 @@
 <multibuild>
-  <package>standard</package>
-  <package>testsuite</package>
+  <package>ucx</package>
+  <package>ucx-testsuite</package>
   <package>ofi</package>
   <package>ofi-testsuite</package>
 </multibuild>
diff --git a/mpich.changes b/mpich.changes
index 5fff4d9..b9ba771 100644
--- a/mpich.changes
+++ b/mpich.changes
@@ -2,6 +2,7 @@
 Tue Nov  4 17:54:18 UTC 2025 - Nicolas Morey <nicolas.morey@suse.com>
 
 - Use external hwloc
+- Rename standard multibuild flavor to ucx for more clarity
 
 -------------------------------------------------------------------
 Tue Oct 28 17:54:04 UTC 2025 - Nicolas Morey <nicolas.morey@suse.com>
diff --git a/mpich.spec b/mpich.spec
index 77b39ef..7211aef 100644
--- a/mpich.spec
+++ b/mpich.spec
@@ -29,10 +29,10 @@
 ExclusiveArch:  do_not_build
 %endif
 
-%if "%{flavor}" == "standard"
+%if "%{flavor}" == "ucx"
 %define build_flavor ucx
 %endif
-%if "%{flavor}" == "testsuite"
+%if "%{flavor}" == "ucx-testsuite"
 %define build_flavor ucx
 %define testsuite 1
 %endif
-- 
2.51.1


From b0b14ebb4ab1207a29129a4e05f757b228ec0ded2e3d2b6ed7c36a37d7bcd792 Mon Sep 17 00:00:00 2001
From: Nicolas Morey <nmorey@suse.com>
Date: Tue, 4 Nov 2025 21:22:41 +0100
Subject: [PATCH 3/3] use autoreconf

This is much much faster than rerunning fully autogen.sh

Signed-off-by: Nicolas Morey <nmorey@suse.com>
---
 mpich.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mpich.spec b/mpich.spec
index 7211aef..9063bc9 100644
--- a/mpich.spec
+++ b/mpich.spec
@@ -191,7 +191,7 @@ export FFLAGS="-fallow-argument-mismatch $FFLAGS"
 export FCFLAGS="-fallow-argument-mismatch $FCFLAGS"
 %endif
 
-./autogen.sh --without-ucx --without-ofi --without-json
+autoreconf
 %configure \
     --prefix=%{p_prefix} \
     --exec-prefix=%{p_prefix} \
-- 
2.51.1