diff --git a/openmpi-4.1.5.tar.bz2 b/openmpi-4.1.6.tar.bz2 similarity index 55% rename from openmpi-4.1.5.tar.bz2 rename to openmpi-4.1.6.tar.bz2 index b2b9429bf4f155ef0aaa8714dbe13d51acd5c5f7..011183ea61db274767fcd3dda2af4f522f638953 100644 Binary files a/openmpi-4.1.5.tar.bz2 and b/openmpi-4.1.6.tar.bz2 differ diff --git a/openmpi.spec b/openmpi.spec index 7b2d88b6ab8b97417e107f754843bd43a015a780..919ceea41e25d3b9e16cd10fee9666b890ae10a0 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -1,6 +1,6 @@ Name: openmpi -Version: 4.1.5 -Release: 7 +Version: 4.1.6 +Release: 1 Summary: Open Source High Performance Computing License: BSD-3-Clause URL: http://www.open-mpi.org/ @@ -9,9 +9,7 @@ Source1: openmpi.module.in Source2: openmpi.pth.py3 Source3: macros.openmpi Patch1000: add-riscv64-support.patch -%ifarch loongarch64 Patch1001: 0001-add-loongarch64-support-for-openmpi.patch -%endif Patch1002: 0002-modify-multicore-timeout-support.patch BuildRequires: gcc-c++, gcc-gfortran @@ -63,10 +61,10 @@ community in order to build the best MPI library available. %package devel Summary: Development files for openmpi Requires: %{name} = %{version}-%{release}, gcc-gfortran -Provides: mpi-devel +Provides: mpi-devel = %{version}-%{release} Requires: java-devel -Provides: %{name}-java-devel -Obsoletes: %{name}-java-devel +Provides: %{name}-java-devel = %{version}-%{release} +Obsoletes: %{name}-java-devel < %{version}-%{release} %description devel This contains dynamic libraries and header files for the developing of openmpi. @@ -78,18 +76,14 @@ Requires: %{name} = %{version}-%{release} %description -n python3-openmpi openmpi python3 interface -%package help -Summary: Including man files for openmpi -Requires: man - -%description help -This contains man files for the using of openmpi. +%package_help %prep %autosetup -n openmpi-%{version} -p1 ./autogen.pl --force %build +%set_build_flags ./configure \ --bindir=%{_bindir} \ --libdir=%{_libdir}/%{name}/lib \ @@ -111,20 +105,14 @@ This contains man files for the using of openmpi. --with-hwloc=/usr \ --with-pmix=external \ --with-libevent=external \ - --mandir=%{_mandir}/%{name_all} \ - CFLAGS="$RPM_OPT_FLAGS" \ - CXXFLAGS="$RPM_OPT_FLAGS" \ - FC=gfortran \ - FCFLAGS="$RPM_OPT_FLAGS" \ - LDFLAGS="-Wl,-z,now" + --mandir=%{_mandir}/%{name_all} %make_build %install %make_install -find %{buildroot}%{_libdir}/%{name}/lib -name \*.la -delete -find %{buildroot}%{_mandir}/%{name_all} -type f -exec gzip -9 {} \; -ln -s mpicc.1.gz %{buildroot}%{_mandir}/%{name_all}/man1/mpiCC.1.gz +%delete_la +ln -sf mpicc.1 %{buildroot}%{_mandir}/%{name_all}/man1/mpiCC.1 rm %{buildroot}%{_mandir}/%{name_all}/man1/mpiCC.1 mkdir %{buildroot}%{_mandir}/%{name_all}/man{2,4,5,6,8,9,n} @@ -137,10 +125,10 @@ sed 's#@LIBDIR@#%{_libdir}/%{name}#; s#@PY3SITEARCH@#%{python3_sitearch}/%{name}#; s#@COMPILER@#openmpi-%{_arch}#; s#@SUFFIX@#_openmpi#' \ - <%{SOURCE1} \ + <%{S:1} \ >%{buildroot}%{_datadir}/modulefiles/mpi/%{name_all} -install -Dpm 644 %{SOURCE3} %{buildroot}/%{rpmmacrodir}/macros.%{name_all} +install -Dpm 644 %{S:3} %{buildroot}/%{rpmmacrodir}/macros.%{name_all} install -d %{buildroot}%{_fmoddir}/%{name} for mod in %{buildroot}%{_libdir}/%{name}/lib/*.mod @@ -158,7 +146,7 @@ sed -i -e s/-ldl// -e s/-lhwloc// \ %{buildroot}%{_libdir}/%{name}/share/%{name}/*-wrapper-data.txt install -d %{buildroot}/%{python3_sitearch}/%{name} -install -pDm0644 %{SOURCE2} %{buildroot}/%{python3_sitearch}/openmpi.pth +install -pDm0644 %{S:2} %{buildroot}/%{python3_sitearch}/openmpi.pth file `find %{buildroot}%{_libdir}/openmpi/bin -type f` | grep -w ELF | awk -F : '{print $1}' |xargs chrpath -d file `find %{buildroot}%{_libdir}/openmpi/lib -type f` | grep -w ELF | awk -F : '{print $1}' |xargs chrpath -d @@ -173,10 +161,8 @@ echo "%{_libdir}/openmpi/lib" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.c %postun /sbin/ldconfig - - %check -make check +%make_build check %files %license LICENSE opal/mca/event/libevent2022/libevent/LICENSE @@ -234,6 +220,9 @@ make check %{_mandir}/%{name_all}/man*/* %changelog +* Sun Sep 08 2024 Funda Wang - 4.1.6-1 +- update to 4.1.6 + * Mon Aug 19 2024 zhangzijian <1220292247@qq.com> - 4.1.5-7 - Modify multicore causing finalize timeout error