From c4e9966efc2f42afc9ce5a6618b609379df2a4d8 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Tue, 15 Oct 2024 22:49:19 +0800 Subject: [PATCH] 32-bit environments are no longer supported --- openmpi.spec | 57 +++++++++++++++++++--------------------------------- openmpi.yaml | 4 ++++ 2 files changed, 25 insertions(+), 36 deletions(-) create mode 100644 openmpi.yaml diff --git a/openmpi.spec b/openmpi.spec index 7834daa..367f4f3 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -1,9 +1,9 @@ Name: openmpi Version: 5.0.5 -Release: 1 +Release: 2 Summary: Open Source High Performance Computing License: BSD-3-Clause -URL: http://www.open-mpi.org/ +URL: https://www.open-mpi.org/ Source0: https://download.open-mpi.org/release/open-mpi/v5.0/openmpi-%{version}.tar.bz2 Source1: openmpi.module.in Source2: openmpi.pth.py3 @@ -15,6 +15,7 @@ Patch1000: add-riscv64-support.patch Patch1001: 0001-add-loongarch64-support-for-openmpi.patch %endif +ExcludeArch: %{ix86} BuildRequires: gcc-c++, gcc-gfortran %ifarch %{valgrind_arches} BuildRequires: valgrind-devel @@ -29,9 +30,6 @@ BuildRequires: automake libtool %ifarch x86_64 BuildRequires: infinipath-psm-devel, libpsm2-devel zlib-devel %endif -%ifarch loongarch64 -BuildRequires: automake -%endif Provides: mpi, %{name}-java Requires: environment(modules), openssh-clients @@ -64,10 +62,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. @@ -79,19 +77,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 - +./autogen.pl --force +%set_build_flags ./configure \ --bindir=%{_bindir} \ --libdir=%{_libdir}/%{name}/lib \ @@ -112,19 +105,13 @@ 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 {} \; +%delete_la mkdir -p %{buildroot}%{_datadir}/modulefiles/mpi sed 's#@LIBDIR@#%{_libdir}/%{name}#; @@ -135,10 +122,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 @@ -156,7 +143,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 @@ -164,17 +151,11 @@ file `find %{buildroot}%{_libdir}/openmpi/lib -type f` | grep -w ELF | awk -F : mkdir -p %{buildroot}/etc/ld.so.conf.d echo "%{_libdir}/openmpi/lib" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf - -%post -/sbin/ldconfig - -%postun -/sbin/ldconfig - - +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig %check -make check +%make_build check %files %license LICENSE @@ -231,6 +212,10 @@ make check %{_mandir}/%{name_all}/man*/* %changelog +* Tue Oct 15 2024 Funda Wang - 5.0.5-2 +- 32-bit environments are no longer supported +- cleanup spec + * Tue Jul 02 2024 xu_ping <707078654@qq.com> - 5.0.5-1 - Upgrade version to 5.0.5 - MPI C++ bindings have been removed. diff --git a/openmpi.yaml b/openmpi.yaml new file mode 100644 index 0000000..09d4468 --- /dev/null +++ b/openmpi.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: open-mpi/ompi +tag_prefix: ^v +separator: . -- Gitee