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

Accepting request 176371 from home:scorot:branches:science

Browse Source 
- fix build for Factory and recent openmpi

OBS-URL: https://build.opensuse.org/request/show/176371
OBS-URL: https://build.opensuse.org/package/show/science/mumps?expand=0&rev=6
This commit is contained in:
Corot Sebastien 2013-05-22 20:41:16 +00:00 committed by Git OBS Bridge
parent b326fd9d1d
commit 2537e02346
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mumps.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed May 22 20:20:13 UTC 2013 - scorot@free.fr
- fix build for Factory and recent openmpi
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Sep 19 21:08:02 UTC 2012 - scorot@free.fr Wed Sep 19 21:08:02 UTC 2012 - scorot@free.fr

8
mumps.spec
View File

@ -284,7 +284,11 @@ cp -f %{S:1} Makefile.inc
export LD_LIBRARY_PATH=%{_libdir}/mpi/gcc/openmpi/%_lib export LD_LIBRARY_PATH=%{_libdir}/mpi/gcc/openmpi/%_lib
make MUMPS_MPI=openmpi \ make MUMPS_MPI=openmpi \
FC=%{_libdir}/mpi/gcc/openmpi/bin/mpif77 \ FC=%{_libdir}/mpi/gcc/openmpi/bin/mpif77 \
%if 0%{?suse_version} > 1230
MUMPS_LIBF77="-L%{_libdir}/mpi/gcc/openmpi/%_lib -lmpi_mpifh -lmpi" \
%else
MUMPS_LIBF77="-L%{_libdir}/mpi/gcc/openmpi/%_lib -lmpi_f77 -lmpi" \ MUMPS_LIBF77="-L%{_libdir}/mpi/gcc/openmpi/%_lib -lmpi_f77 -lmpi" \
%endif
OPTC="$RPM_OPT_FLAGS" \ OPTC="$RPM_OPT_FLAGS" \
INCPAR=-I%{_libdir}/mpi/gcc/openmpi/include \ INCPAR=-I%{_libdir}/mpi/gcc/openmpi/include \
PLAT="_ptscotch" all PLAT="_ptscotch" all
@ -317,7 +321,11 @@ cp %{S:4} Makefile.inc
export LD_LIBRARY_PATH=%{_libdir}/mpi/gcc/openmpi/%_lib export LD_LIBRARY_PATH=%{_libdir}/mpi/gcc/openmpi/%_lib
make MUMPS_MPI=openmpi \ make MUMPS_MPI=openmpi \
FC=%{_libdir}/mpi/gcc/openmpi/bin/mpif77 \ FC=%{_libdir}/mpi/gcc/openmpi/bin/mpif77 \
%if 0%{?suse_version} > 1230
MUMPS_LIBF77="-L%{_libdir}/mpi/gcc/openmpi/%_lib -lmpi_mpifh -lmpi" \
%else
MUMPS_LIBF77="-L%{_libdir}/mpi/gcc/openmpi/%_lib -lmpi_f77 -lmpi" \ MUMPS_LIBF77="-L%{_libdir}/mpi/gcc/openmpi/%_lib -lmpi_f77 -lmpi" \
%endif
OPTC="$RPM_OPT_FLAGS" all OPTC="$RPM_OPT_FLAGS" all
# build test programs # build test programs
cd examples cd examples