rpm/openmpi4
SHA256
1
0
Fork 0
forked from pool/openmpi4
Code Pull Requests Activity

- Add orted-mpir-add-version-to-shared-library.patch to fix unversionned library

Browse Source 
- Change RPM macros install path to %{_rpmmacrodir}

OBS-URL: https://build.opensuse.org/package/show/science:HPC/openmpi4?expand=0&rev=17
This commit is contained in:
Nicolas Morey-Chaisemartin 2021-04-30 15:10:32 +00:00 committed by Git OBS Bridge
parent dbbdfa5742
commit 1986d94aaf
3 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openmpi4.changes
View File

@ -2,6 +2,8 @@
Wed Apr 28 11:08:54 UTC 2021 - Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
- openmpi4 is now the default openmpi for releases > 15.3
- Add orted-mpir-add-version-to-shared-library.patch to fix unversionned library
- Change RPM macros install path to %{_rpmmacrodir}
-------------------------------------------------------------------
Wed Apr 28 09:24:33 UTC 2021 - Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>

16
openmpi4.spec
View File

@ -139,6 +139,7 @@ Source2: openmpi4-rpmlintrc
Source3: macros.hpc-openmpi
Source4: mpivars.sh
Source5: mpivars.csh
Patch1: orted-mpir-add-version-to-shared-library.patch
Provides: mpi
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
@ -397,6 +398,7 @@ echo with HPC
echo without HPC
%endif
%setup -q -n openmpi-%{version}%{git_ver}
%patch1
%if %{without hpc}
cat > %{_sourcedir}/baselibs.conf <<EOF
@ -537,8 +539,8 @@ prepend-path LD_LIBRARY_PATH %{mpi_libdir}
EOF
mkdir -p %{buildroot}%{_sysconfdir}/rpm
cat <<EOF >%{buildroot}%{_sysconfdir}/rpm/macros.openmpi
mkdir -p %{buildroot}%{_rpmmacrodir}
cat <<EOF >%{buildroot}%{_rpmmacrodir}/macros.openmpi
#
# openmpi
#
@ -584,9 +586,9 @@ EOF
sed -e "s/export/setenv/" -e "s/=/ /" \
%{buildroot}/%{mpi_bindir}/mpivars.sh > \
%{buildroot}/%{mpi_bindir}/mpivars.csh
mkdir -p %{buildroot}%{_sysconfdir}/rpm
mkdir -p %{buildroot}%{_sysconfdir}/rpm
cp %{S:3} %{buildroot}%{_sysconfdir}/rpm
mkdir -p %{buildroot}%{_rpmmacrodir}
mkdir -p %{buildroot}%{_rpmmacrodir}
cp %{S:3} %{buildroot}%{_rpmmacrodir}
# Drop the files that should go into %{pname}-config as we only package them
# in the non HPC build
@ -734,9 +736,9 @@ fi
%files macros-devel
%defattr(-,root,root,-)
%if %{with hpc}
%config %{_sysconfdir}/rpm/macros.hpc-openmpi
%{_rpmmacrodir}/macros.hpc-openmpi
%else
%config %{_sysconfdir}/rpm/macros.openmpi
%{_rpmmacrodir}/macros.openmpi
%endif
%if 0%{?build_static_devel}

22
orted-mpir-add-version-to-shared-library.patch Normal file
View File

@ -0,0 +1,22 @@
commit bd2ceac4315c772e02cbb070e443d1acf2512da1
Author: Andrew J. Hesford <ajh@sideband.org>
Date: Thu Apr 29 15:13:23 2021 -0400
orted-mpir: add version to shared library
Because orted-mpir is installed in the public library direrctory, it
should have a version. Assign the library libopen_rte_so_version to be
consistent with the rest of the RTE.
Signed-off-by: Andrew J. Hesford <ajh@sideband.org>
diff --git orte/orted/orted-mpir/Makefile.am orte/orted/orted-mpir/Makefile.am
index 5c0dd335644a..8105dd4a6b83 100644
--- orte/orted/orted-mpir/Makefile.am
+++ orte/orted/orted-mpir/Makefile.am
@@ -19,4 +19,4 @@ lib_LTLIBRARIES = lib@ORTE_LIB_PREFIX@open-orted-mpir.la
lib@ORTE_LIB_PREFIX@open_orted_mpir_la_SOURCES = \
orted_mpir_breakpoint.c \
orted_mpir.h
-lib@ORTE_LIB_PREFIX@open_orted_mpir_la_LDFLAGS = -avoid-version
+lib@ORTE_LIB_PREFIX@open_orted_mpir_la_LDFLAGS = -version-info $(libopen_rte_so_version)