From 2537e023467711af76de111af0fe9e1ee9e20a6d5fb0ef171c431875fb30f9f1 Mon Sep 17 00:00:00 2001 From: Corot Sebastien Date: Wed, 22 May 2013 20:41:16 +0000 Subject: [PATCH] Accepting request 176371 from home:scorot:branches:science - 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 --- mumps.changes | 5 +++++ mumps.spec | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/mumps.changes b/mumps.changes index d0b9beb..80f3fef 100644 --- a/mumps.changes +++ b/mumps.changes @@ -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 diff --git a/mumps.spec b/mumps.spec index 4572d2f..0590bf4 100644 --- a/mumps.spec +++ b/mumps.spec @@ -284,7 +284,11 @@ cp -f %{S:1} Makefile.inc export LD_LIBRARY_PATH=%{_libdir}/mpi/gcc/openmpi/%_lib make MUMPS_MPI=openmpi \ 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" \ +%endif OPTC="$RPM_OPT_FLAGS" \ INCPAR=-I%{_libdir}/mpi/gcc/openmpi/include \ PLAT="_ptscotch" all @@ -317,7 +321,11 @@ cp %{S:4} Makefile.inc export LD_LIBRARY_PATH=%{_libdir}/mpi/gcc/openmpi/%_lib make MUMPS_MPI=openmpi \ 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" \ +%endif OPTC="$RPM_OPT_FLAGS" all # build test programs cd examples