Accepting request 742626 from science:HPC:mpi-cleanup
- Use new openmpi-macros-devel package OBS-URL: https://build.opensuse.org/request/show/742626 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=239
This commit is contained in:
parent
181191f0d1
commit
4dbc636325
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Oct 3 14:13:20 UTC 2019 - Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
|
||||||
|
|
||||||
|
- Use new openmpi-macros-devel package
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Sep 19 15:34:53 UTC 2019 - Andreas Schwab <schwab@suse.de>
|
Thu Sep 19 15:34:53 UTC 2019 - Andreas Schwab <schwab@suse.de>
|
||||||
|
|
||||||
|
27
boost.spec
27
boost.spec
@ -105,18 +105,6 @@ ExcludeArch: s390x %{ix86} ppc64 ppc64le
|
|||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# Build with OpenMPI
|
|
||||||
%if 0%{?suse_version} >= 1330
|
|
||||||
# OpenMPI >= 2 is not available on ppc64be
|
|
||||||
%ifarch ppc ppc64
|
|
||||||
%define mpi_implem openmpi
|
|
||||||
%else
|
|
||||||
%define mpi_implem openmpi2
|
|
||||||
%endif
|
|
||||||
%else
|
|
||||||
# Keep OpenMPI1 for older releases where OpenMPI2 is not available
|
|
||||||
%define mpi_implem openmpi
|
|
||||||
%endif
|
|
||||||
%ifarch ia64 hppa
|
%ifarch ia64 hppa
|
||||||
%bcond_with build_mpi
|
%bcond_with build_mpi
|
||||||
%else
|
%else
|
||||||
@ -226,9 +214,6 @@ BuildRequires: python3-devel
|
|||||||
BuildRequires: python3-numpy-devel
|
BuildRequires: python3-numpy-devel
|
||||||
%endif # numpy3
|
%endif # numpy3
|
||||||
%endif # python3
|
%endif # python3
|
||||||
%if %{with build_mpi}
|
|
||||||
BuildRequires: %{mpi_implem}-devel
|
|
||||||
%endif
|
|
||||||
%if %{with build_docs}
|
%if %{with build_docs}
|
||||||
BuildRequires: docbook
|
BuildRequires: docbook
|
||||||
BuildRequires: docbook-xsl-stylesheets
|
BuildRequires: docbook-xsl-stylesheets
|
||||||
@ -247,6 +232,10 @@ BuildRequires: suse-hpc
|
|||||||
BuildRequires: %{mpi_flavor}%{?mpi_vers}-%{compiler_family}%{?c_f_ver}-hpc-macros-devel
|
BuildRequires: %{mpi_flavor}%{?mpi_vers}-%{compiler_family}%{?c_f_ver}-hpc-macros-devel
|
||||||
Requires: %{mpi_flavor}%{?mpi_vers}-%{compiler_family}%{?c_f_ver}-hpc
|
Requires: %{mpi_flavor}%{?mpi_vers}-%{compiler_family}%{?c_f_ver}-hpc
|
||||||
%endif
|
%endif
|
||||||
|
%else
|
||||||
|
%if %{with build_mpi}
|
||||||
|
BuildRequires: openmpi-macros-devel
|
||||||
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -716,7 +705,9 @@ This package contains the Boost.MPI runtime library.
|
|||||||
%package -n libboost_mpi%{library_version}-devel
|
%package -n libboost_mpi%{library_version}-devel
|
||||||
Summary: Development headers for Boost.MPI library
|
Summary: Development headers for Boost.MPI library
|
||||||
Group: Development/Libraries/C and C++
|
Group: Development/Libraries/C and C++
|
||||||
Requires: %{mpi_implem}-devel
|
%if %{with build_mpi}
|
||||||
|
%{?openmpi_devel_requires}
|
||||||
|
%endif
|
||||||
Requires: libboost_graph%{library_version}-devel
|
Requires: libboost_graph%{library_version}-devel
|
||||||
Requires: libboost_headers%{library_version}-devel = %{version}
|
Requires: libboost_headers%{library_version}-devel = %{version}
|
||||||
Requires: libboost_mpi%{library_version} = %{version}
|
Requires: libboost_mpi%{library_version} = %{version}
|
||||||
@ -1284,7 +1275,7 @@ EOF
|
|||||||
%if %{with hpc}
|
%if %{with hpc}
|
||||||
module load gnu %mpi_flavor
|
module load gnu %mpi_flavor
|
||||||
%else
|
%else
|
||||||
. %{package_libdir}/mpi/gcc/%{mpi_implem}/bin/mpivars.sh
|
%setup_openmpi
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -1437,7 +1428,7 @@ cd doc
|
|||||||
%if %{with hpc}
|
%if %{with hpc}
|
||||||
module load gnu %mpi_flavor
|
module load gnu %mpi_flavor
|
||||||
%else
|
%else
|
||||||
. %{package_libdir}/mpi/gcc/%{mpi_implem}/bin/mpivars.sh
|
%setup_openmpi
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user