From 2f0e197c03f094f916611d26ac8b0cb089fb4ff9a0c9bde84a70e7414cb17b30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Wed, 25 Nov 2015 12:03:03 +0000 Subject: [PATCH] Accepting request 346133 from home:scorot:branches:science - fix build against recent scalapack which includes blacs library OBS-URL: https://build.opensuse.org/request/show/346133 OBS-URL: https://build.opensuse.org/package/show/science/mumps?expand=0&rev=7 --- Makefile.par.inc | 2 +- Makefile.ptscotch.inc | 2 +- mumps.changes | 5 +++++ mumps.spec | 4 ---- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile.par.inc b/Makefile.par.inc index 1857f87..976ab89 100644 --- a/Makefile.par.inc +++ b/Makefile.par.inc @@ -69,7 +69,7 @@ FL = mpif77 AR = ar vr #RANLIB = ranlib RANLIB = echo -SCALAP = -lscalapack -lmpiblacs -lmpiblacsCinit +SCALAP = -lscalapack #INCPAR = -I/usr/local/include #INCPAR = -I/usr/include/mpi # LIBPAR = $(SCALAP) -L/usr/local/lib/ -llammpio -llamf77mpi -lmpi -llam -lutil -ldl -lpthread diff --git a/Makefile.ptscotch.inc b/Makefile.ptscotch.inc index ad93235..c88b9fa 100644 --- a/Makefile.ptscotch.inc +++ b/Makefile.ptscotch.inc @@ -69,7 +69,7 @@ FL = gfortran AR = ar vr #RANLIB = ranlib RANLIB = echo -SCALAP = -lscalapack -lmpiblacs -lmpiblacsCinit +SCALAP = -lscalapack #INCPAR = -I/usr/local/include #INCPAR = -I/usr/include/mpi # LIBPAR = $(SCALAP) -L/usr/local/lib/ -llammpio -llamf77mpi -lmpi -llam -lutil -ldl -lpthread diff --git a/mumps.changes b/mumps.changes index 80f3fef..b74bed1 100644 --- a/mumps.changes +++ b/mumps.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Nov 21 14:23:53 UTC 2015 - scorot@free.fr + +- fix build against recent scalapack which includes blacs library + ------------------------------------------------------------------- Wed May 22 20:20:13 UTC 2013 - scorot@free.fr diff --git a/mumps.spec b/mumps.spec index 0590bf4..49f2719 100644 --- a/mumps.spec +++ b/mumps.spec @@ -39,14 +39,12 @@ Patch1: mumps-4.9.2-debian-shared-pord.patch Patch2: mumps-4.9.2-debian-tests-shlibs.patch Patch3: mumps-4.9.2-debian-shared-mumps.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: blacs-openmpi-devel BuildRequires: gcc-fortran BuildRequires: libptscotch-openmpi-devel BuildRequires: libscotch-devel BuildRequires: openmpi-devel BuildRequires: scalapack-openmpi-devel %if 0%{?sles_version} -BuildRequires: blacs-mvapich2-devel BuildRequires: libptscotch-mvapich2-devel BuildRequires: mvapich2-devel BuildRequires: scalapack-mvapich2-devel @@ -138,7 +136,6 @@ Scotch enabled. %package openmpi-devel Summary: Files needed for developing mumps based applications Group: Development/Libraries/Parallel -Requires: blacs-openmpi-devel Requires: blas-devel Requires: lapack-devel Requires: mumps-devel = %{version} @@ -201,7 +198,6 @@ Scotch enabled. %package mvapich2-devel Summary: Files needed for developing mumps based applications Group: Development/Libraries/Parallel -Requires: blacs-mvapich2-devel Requires: blas-devel Requires: lapack-devel Requires: mumps-devel = %{version}