rpms
/
boost
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

s/mpich2/mpich/

This commit is contained in:
Petr Machata 2013-07-23 19:21:12 +02:00
parent 0d0ad94a52
commit 084c523878
1 changed files with 50 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
boost.spec
View File

@ -6,9 +6,9 @@
%define boost_examplesdir __tmp_examplesdir
%ifarch %{arm}
%bcond_with mpich2
%bcond_with mpich
%else
%bcond_without mpich2
%bcond_without mpich
%endif
%ifarch s390 s390x %{arm}
@ -518,52 +518,52 @@ back-end to do the parallel work.
%endif
%if %{with mpich2}
%if %{with mpich}
%package mpich2
%package mpich
Summary: Run-Time component of Boost.MPI library
Group: System Environment/Libraries
Requires: mpich2
BuildRequires: mpich2-devel
Requires: mpich
BuildRequires: mpich-devel
%description mpich2
%description mpich
Run-Time support for Boost.MPI-MPICH2, a library providing a clean C++
API over the MPICH2 implementation of MPI.
Run-Time support for Boost.MPI-MPICH, a library providing a clean C++
API over the MPICH implementation of MPI.
%package mpich2-devel
%package mpich-devel
Summary: Shared library symbolic links for Boost.MPI
Group: System Environment/Libraries
Requires: boost-devel = %{version}-%{release}
Requires: boost-mpich2 = %{version}-%{release}
Requires: boost-mpich2-python = %{version}-%{release}
Requires: boost-graph-mpich2 = %{version}-%{release}
Requires: boost-mpich = %{version}-%{release}
Requires: boost-mpich-python = %{version}-%{release}
Requires: boost-graph-mpich = %{version}-%{release}
%description mpich2-devel
%description mpich-devel
Devel package for Boost.MPI-MPICH2, a library providing a clean C++
API over the MPICH2 implementation of MPI.
Devel package for Boost.MPI-MPICH, a library providing a clean C++
API over the MPICH implementation of MPI.
%package mpich2-python
%package mpich-python
Summary: Python run-time component of Boost.MPI library
Group: System Environment/Libraries
Requires: boost-mpich2 = %{version}-%{release}
Requires: boost-mpich = %{version}-%{release}
%description mpich2-python
%description mpich-python
Python support for Boost.MPI-MPICH2, a library providing a clean C++
API over the MPICH2 implementation of MPI.
Python support for Boost.MPI-MPICH, a library providing a clean C++
API over the MPICH implementation of MPI.
%package graph-mpich2
%package graph-mpich
Summary: Run-Time component of parallel boost graph library
Group: System Environment/Libraries
Requires: boost-mpich2 = %{version}-%{release}
Requires: boost-mpich = %{version}-%{release}
%description graph-mpich2
%description graph-mpich
Run-Time support for the Parallel BGL graph library. The interface and
graph components are generic, in the same sense as the the Standard
Template Library (STL). This libraries in this package use MPICH2
Template Library (STL). This libraries in this package use MPICH
back-end to do the parallel work.
%endif
@ -686,7 +686,7 @@ echo ============================= build serial ==================
# Build MPI parts of Boost with OpenMPI support
%if %{with openmpi} || %{with mpich2}
%if %{with openmpi} || %{with mpich}
# First, purge all modules so that user environment doesn't conflict
# with the build.
module purge ||:
@ -707,15 +707,15 @@ echo ============================= build $MPI_COMPILER ==================
export PATH=/bin${PATH:+:}$PATH
%endif
# Build MPI parts of Boost with MPICH2 support
%if %{with mpich2}
%{_mpich2_load}
# Build MPI parts of Boost with MPICH support
%if %{with mpich}
%{_mpich_load}
echo ============================= build $MPI_COMPILER ==================
./b2 -d+2 -q %{?_smp_mflags} --layout=tagged \
--with-mpi --with-graph_parallel --build-dir=$MPI_COMPILER \
variant=release threading=multi debug-symbols=on pch=off \
python=%{python2_version} stage
%{_mpich2_unload}
%{_mpich_unload}
export PATH=/bin${PATH:+:}$PATH
%endif
@ -732,7 +732,7 @@ rm -rf $RPM_BUILD_ROOT
cd %{_builddir}/%{toplev_dirname}
%if %{with openmpi} || %{with mpich2}
%if %{with openmpi} || %{with mpich}
# First, purge all modules so that user environment doesn't conflict
# with the build.
module purge ||:
@ -754,8 +754,8 @@ rm -f ${RPM_BUILD_ROOT}${MPI_HOME}/lib/libboost_{python,{w,}serialization}*
export PATH=/bin${PATH:+:}$PATH
%endif
%if %{with mpich2}
%{_mpich2_load}
%if %{with mpich}
%{_mpich_load}
echo ============================= install $MPI_COMPILER ==================
./b2 -q %{?_smp_mflags} --layout=tagged \
--with-mpi --with-graph_parallel --build-dir=$MPI_COMPILER \
@ -766,7 +766,7 @@ echo ============================= install $MPI_COMPILER ==================
# Remove generic parts of boost that were built for dependencies.
rm -f ${RPM_BUILD_ROOT}${MPI_HOME}/lib/libboost_{python,{w,}serialization}*
%{_mpich2_unload}
%{_mpich_unload}
export PATH=/bin${PATH:+:}$PATH
%endif
@ -1132,8 +1132,8 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-, root, root, -)
%doc LICENSE_1_0.txt
%{_libdir}/*.a
%if %{with mpich2}
%{_libdir}/mpich2/lib/*.a
%if %{with mpich}
%{_libdir}/mpich/lib/*.a
%endif
%if %{with openmpi}
%{_libdir}/openmpi/lib/*.a
@ -1165,29 +1165,29 @@ rm -rf $RPM_BUILD_ROOT
%endif
# MPICH2 packages
%if %{with mpich2}
# MPICH packages
%if %{with mpich}
%files mpich2
%files mpich
%defattr(-, root, root, -)
%doc LICENSE_1_0.txt
%{_libdir}/mpich2/lib/libboost_mpi-mt.so.%{sonamever}
%{_libdir}/mpich/lib/libboost_mpi-mt.so.%{sonamever}
%files mpich2-devel
%files mpich-devel
%defattr(-, root, root, -)
%doc LICENSE_1_0.txt
%{_libdir}/mpich2/lib/libboost_*.so
%{_libdir}/mpich/lib/libboost_*.so
%files mpich2-python
%files mpich-python
%defattr(-, root, root, -)
%doc LICENSE_1_0.txt
%{_libdir}/mpich2/lib/libboost_mpi_python*.so.%{sonamever}
%{_libdir}/mpich2/lib/mpi.so
%{_libdir}/mpich/lib/libboost_mpi_python*.so.%{sonamever}
%{_libdir}/mpich/lib/mpi.so
%files graph-mpich2
%files graph-mpich
%defattr(-, root, root, -)
%doc LICENSE_1_0.txt
%{_libdir}/mpich2/lib/libboost_graph_parallel-mt.so.%{sonamever}
%{_libdir}/mpich/lib/libboost_graph_parallel-mt.so.%{sonamever}
%endif
@ -1203,7 +1203,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/bjam.1*
%changelog
* Fri Jul 19 2013 Petr Machata <pmachata@redhat.com> - 1.53.0-8
* Tue Jul 23 2013 Petr Machata <pmachata@redhat.com> - 1.53.0-8
- MPICH2 became MPICH -- rename subpackages, dependencies and
conditionals.
- Install supporting files (images etc.) for documentation
(courtesy Marcel Metz, bug 985593)
- Add many patches for silencing unused local typedef warnings