Fix mpi build for that great cmake macro update
This commit is contained in:
parent
7705ffac66
commit
149ebf7aae
26
mathgl.spec
26
mathgl.spec
@ -19,7 +19,7 @@
|
|||||||
|
|
||||||
Name: mathgl
|
Name: mathgl
|
||||||
Version: 2.4.4
|
Version: 2.4.4
|
||||||
Release: 6%{?dist}
|
Release: 7%{?dist}
|
||||||
Summary: Cross-platform library for making high-quality scientific graphics
|
Summary: Cross-platform library for making high-quality scientific graphics
|
||||||
Summary(de): Plattformübergreifende Bibliothek für hochwertige wissenschaftliche Graphiken
|
Summary(de): Plattformübergreifende Bibliothek für hochwertige wissenschaftliche Graphiken
|
||||||
Summary(ru): Библиотека для осуществления высококачественной визуализации данных
|
Summary(ru): Библиотека для осуществления высококачественной визуализации данных
|
||||||
@ -391,19 +391,17 @@ BUILD_MPI="-Denable-mpi=off \
|
|||||||
# Disable SMP build
|
# Disable SMP build
|
||||||
|
|
||||||
%define buildcommon() \
|
%define buildcommon() \
|
||||||
mkdir -p %{_target_platform}_$MPI_COMPILER_NAME; \
|
|
||||||
pushd %{_target_platform}_$MPI_COMPILER_NAME; \
|
|
||||||
%cmake \\\
|
%cmake \\\
|
||||||
-DMathGL_INSTALL_CMAKE_DIR=%{_libdir}/cmake/mathgl \\\
|
-DMathGL_INSTALL_CMAKE_DIR=%{_libdir}/cmake/mathgl \\\
|
||||||
-DMathGL_INSTALL_LIB_DIR=%{_libdir} \\\
|
-DMathGL_INSTALL_LIB_DIR=%{_libdir} \\\
|
||||||
-Denable-all=on \\\
|
-Denable-all=on \\\
|
||||||
$BUILD_MPI \\\
|
$BUILD_MPI \\\
|
||||||
..; \
|
..; \
|
||||||
popd; \
|
%{cmake_build}
|
||||||
make -C %{_target_platform}_$MPI_COMPILER_NAME
|
|
||||||
|
|
||||||
# serial
|
# serial
|
||||||
MPI_COMPILER_NAME=serial %building_serial
|
%global _vpath_builddir %{_target_platform}_serial
|
||||||
|
%building_serial
|
||||||
|
|
||||||
# MPI vars
|
# MPI vars
|
||||||
export CC=mpicc
|
export CC=mpicc
|
||||||
@ -412,14 +410,16 @@ export CXX=mpicxx
|
|||||||
%if 0%{?with_openmpi}
|
%if 0%{?with_openmpi}
|
||||||
# OpenMPI
|
# OpenMPI
|
||||||
%{_openmpi_load}
|
%{_openmpi_load}
|
||||||
MPI_COMPILER_NAME=openmpi %building
|
%global _vpath_builddir %{_target_platform}_openmpi
|
||||||
|
%building
|
||||||
%{_openmpi_unload}
|
%{_openmpi_unload}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if 0%{?with_mpich2}
|
%if 0%{?with_mpich2}
|
||||||
# MPICH2
|
# MPICH2
|
||||||
%{_mpich_load}
|
%{_mpich_load}
|
||||||
MPI_COMPILER_NAME=mpich %building
|
%global _vpath_builddir %{_target_platform}_mpich
|
||||||
|
%building
|
||||||
%{_mpich_unload}
|
%{_mpich_unload}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -436,7 +436,8 @@ rm -f %{buildroot}%{_libdir}/$MPI_COMPILER_NAME/lib/*.a; \
|
|||||||
rm -r %{buildroot}%{_libdir}/$MPI_COMPILER_NAME/usr
|
rm -r %{buildroot}%{_libdir}/$MPI_COMPILER_NAME/usr
|
||||||
|
|
||||||
# Serial
|
# Serial
|
||||||
make install DESTDIR=%{buildroot} -C %{_target_platform}_serial INSTALL="install -p"
|
%global _vpath_builddir %{_target_platform}_serial
|
||||||
|
%{cmake_install}
|
||||||
%if 0%{?with_octave}
|
%if 0%{?with_octave}
|
||||||
rm -f %{buildroot}%{_datadir}/%{name}/mathgl.tar.gz
|
rm -f %{buildroot}%{_datadir}/%{name}/mathgl.tar.gz
|
||||||
mkdir -p %{mgl_octarch_dir}
|
mkdir -p %{mgl_octarch_dir}
|
||||||
@ -449,9 +450,11 @@ rm -f %{mgl_octarch_dir}/%{mgl_octarch_name}/%{octpkg}.tar.gz
|
|||||||
%find_lang %{name}
|
%find_lang %{name}
|
||||||
%find_lang udav --with-qt
|
%find_lang udav --with-qt
|
||||||
|
|
||||||
|
# No that modern cmake_install macros for mpi install.
|
||||||
%if 0%{?with_openmpi}
|
%if 0%{?with_openmpi}
|
||||||
# OpenMPI
|
# OpenMPI
|
||||||
%{_openmpi_load}
|
%{_openmpi_load}
|
||||||
|
%global _vpath_builddir %{_target_platform}_openmpi
|
||||||
MPI_COMPILER_NAME=openmpi %installing
|
MPI_COMPILER_NAME=openmpi %installing
|
||||||
%{_openmpi_unload}
|
%{_openmpi_unload}
|
||||||
%endif
|
%endif
|
||||||
@ -459,13 +462,13 @@ MPI_COMPILER_NAME=openmpi %installing
|
|||||||
%if 0%{?with_mpich2}
|
%if 0%{?with_mpich2}
|
||||||
# MPICH
|
# MPICH
|
||||||
%{_mpich_load}
|
%{_mpich_load}
|
||||||
|
%global _vpath_builddir %{_target_platform}_mpich
|
||||||
MPI_COMPILER_NAME=mpich %installing
|
MPI_COMPILER_NAME=mpich %installing
|
||||||
%{_mpich_unload}
|
%{_mpich_unload}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
#Remove symlink to .so file in python dir. Let python find libs normally
|
#Remove symlink to .so file in python dir. Let python find libs normally
|
||||||
# not needed now?
|
# not needed now?
|
||||||
#unlink %{buildroot}/%{python_sitelib}/_mathgl.so
|
|
||||||
#unlink %{buildroot}/%{python3_sitelib}/_mathgl.so
|
#unlink %{buildroot}/%{python3_sitelib}/_mathgl.so
|
||||||
|
|
||||||
#Remove static libraries generated by cmake
|
#Remove static libraries generated by cmake
|
||||||
@ -628,6 +631,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/mgllab.desktop
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jul 30 2020 Dmitrij S. Kryzhevich <kryzhev@ispms.ru> - 2.4.4-7
|
||||||
|
- Fix mpi build for that great cmake macro update.
|
||||||
|
|
||||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.4-6
|
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.4-6
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user