From 155b8ebc470d9abc519a614e86f49fb1923b4a718abc3bb2d75c4e7897eee7a0 Mon Sep 17 00:00:00 2001 From: Nicolas Morey Date: Tue, 4 Nov 2025 21:31:28 +0100 Subject: [PATCH 1/3] Replace call to autogen.sh with autoreconf Signed-off-by: Nicolas Morey --- mvapich2.changes | 5 +++++ mvapich2.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mvapich2.changes b/mvapich2.changes index fce509d..9229c41 100644 --- a/mvapich2.changes +++ b/mvapich2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 4 20:31:05 UTC 2025 - Nicolas Morey + +- Replace call to autogen.sh with autoreconf + ------------------------------------------------------------------- Fri Jul 11 08:07:56 UTC 2025 - Nicolas Morey diff --git a/mvapich2.spec b/mvapich2.spec index 6837a8d..5cb6e2b 100644 --- a/mvapich2.spec +++ b/mvapich2.spec @@ -192,7 +192,7 @@ export FFLAGS="-fallow-argument-mismatch $FFLAGS" export CFLAGS="-std=gnu17 $CFLAGS" %endif -PERL_USE_UNSAFE_INC=1 ./autogen.sh +PERL_USE_UNSAFE_INC=1 autoreconf -fi %configure \ --prefix=%{p_prefix} \ --exec-prefix=%{p_prefix} \ -- 2.51.1 From 6b6a45a86aa62f2ef2bffced09f6502402fb1e0bfec06ff240f263959aa46acd Mon Sep 17 00:00:00 2001 From: Nicolas Morey Date: Sun, 9 Nov 2025 00:33:55 +0100 Subject: [PATCH 2/3] Speed up testsuite by not rebuilding mvpich2 completely Signed-off-by: Nicolas Morey --- mvapich2.changes | 1 + mvapich2.spec | 26 +++++++++++++++++--------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/mvapich2.changes b/mvapich2.changes index 9229c41..5544152 100644 --- a/mvapich2.changes +++ b/mvapich2.changes @@ -2,6 +2,7 @@ Tue Nov 4 20:31:05 UTC 2025 - Nicolas Morey - Replace call to autogen.sh with autoreconf +- Speed up testsuite by not rebuilding mvpich2 completely ------------------------------------------------------------------- Fri Jul 11 08:07:56 UTC 2025 - Nicolas Morey diff --git a/mvapich2.spec b/mvapich2.spec index 5cb6e2b..d764ccf 100644 --- a/mvapich2.spec +++ b/mvapich2.spec @@ -127,6 +127,10 @@ BuildRequires: libibmad-devel %endif Requires: mpi-selector +%if 0%{?testsuite} +BuildRequires: %package_name-devel = %{version} +%endif + %description This is an MPI-3 implementation which includes all MPI-1 features. It is based on MPICH2 and MVICH. @@ -219,21 +223,25 @@ PERL_USE_UNSAFE_INC=1 autoreconf -fi --disable-ibv-dlopen \ %endif --without-mpe -make %{?_smp_mflags} V=1 %if 0%{?testsuite} -%check -make V=1 check -%endif - %install - -%if 0%{?testsuite} -# Remove everything from testsuite package -# It is all contained by mvapich2 packages rm -rf %{buildroot}/* +%check +# Disable CMA. Modern kernels require specific ptrace capabilities +# that are not available in OBS +export MPIR_CVAR_CH4_CMA_ENABLE=0 +for dir in src/mpl src/openpa src/pm/hydra/mpl; do + ( + cd $dir && make check + ) +done + %else +make %{?_smp_mflags} V=1 + +%install make DESTDIR=%{buildroot} V=1 install rm -f %{buildroot}%{p_libdir}/libfmpich.la \ -- 2.51.1 From 2b8c6522e7c0c398591686bb9587e3a24eda491dfdbd8ef2dbbe30b5ec02e241 Mon Sep 17 00:00:00 2001 From: Nicolas Morey Date: Sun, 9 Nov 2025 00:51:07 +0100 Subject: [PATCH 3/3] Fix CFLAGS/FFLAGS Signed-off-by: Nicolas Morey --- mvapich2.changes | 1 + mvapich2.spec | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mvapich2.changes b/mvapich2.changes index 5544152..faa9463 100644 --- a/mvapich2.changes +++ b/mvapich2.changes @@ -3,6 +3,7 @@ Tue Nov 4 20:31:05 UTC 2025 - Nicolas Morey - Replace call to autogen.sh with autoreconf - Speed up testsuite by not rebuilding mvpich2 completely +- Fix CFLAGS/FFLAGS ------------------------------------------------------------------- Fri Jul 11 08:07:56 UTC 2025 - Nicolas Morey diff --git a/mvapich2.spec b/mvapich2.spec index d764ccf..54f52ad 100644 --- a/mvapich2.spec +++ b/mvapich2.spec @@ -192,8 +192,8 @@ cp /usr/share/automake*/config.* . # GCC10 needs an extra flag to allow badly passed parameters %if 0%{?suse_version} > 1500 -export FFLAGS="-fallow-argument-mismatch $FFLAGS" -export CFLAGS="-std=gnu17 $CFLAGS" +export FFLAGS="-fallow-argument-mismatch %{optflags}" +export CFLAGS="-std=gnu17 %{optflags}" %endif PERL_USE_UNSAFE_INC=1 autoreconf -fi -- 2.51.1