4 files changed, 56 insertions, 73 deletions

diff --git a/math/sdpara/files/patch-Makefile b/math/sdpara/files/patch-Makefile
index f5c363278af8..8923ea82a9a1 100644
--- a/math/sdpara/files/patch-Makefile
+++ b/math/sdpara/files/patch-Makefile
@@ -1,43 +1,37 @@
---- Makefile.orig	Fri Oct  8 15:08:59 2004
-+++ Makefile	Thu May 12 14:02:57 2005
-@@ -18,11 +18,10 @@
- # This file is Makefile of SDPARA
- # $Id: Makefile,v 1.2 2004/10/08 05:57:48 makoto Exp $
+--- Makefile.orig	2009-01-09 11:26:29.000000000 +0900
++++ Makefile	2009-02-17 14:11:48.000000000 +0900
+@@ -4,20 +4,20 @@
+ # you edit here along your environment
+ ############################################################
  
--LAPACK = $(HOME)/lapack
-+LAPACK = %%LOCALBASE%%
- RSDPA  = .
+-CC       = mpicc
+-CXX      = mpicxx
+-FC       = mpif77
+-CFLAGS   = -O3
+-CXXFLAGS = -O3
+-FFLAGS   = -O3
+-
+-LAPACK_LIBS = /usr/local/lapack/lib/liblapack.a
+-BLAS_LIBS   = /usr/local/lapack/lib/libblas.a
+-
+-SCALAPACK_LIBS  = /usr/local/scalapack/lib/libscalapack.a /usr/local/BLACS/LIB/blacs_MPI-LINUX-0.a /usr/local/BLACS/LIB/blacsCinit_MPI-LINUX-0.a /usr/local/BLACS/LIB/blacs_MPI-LINUX-0.a
+-
+-FORTRAN_LIBS = -lgfortran
+-PTHERAD_LIBS = -lpthread
++CC       = %%MPICC%%
++CXX      = %%MPICXX%%
++F77      = %%MPIF77%%
++CFLAGS   = %%CFLAGS%%
++CXXFLAGS = %%CXXFLAGS%%
++F77FLAGS = %%FFLAGS%%
++
++LAPACK_LIBS = %%LAPACK%%
++BLAS_LIBS   = %%BLAS%%
++  
++SCALAPACK_LIBS  = %%SCALAPACK%%
++  
++FORTRAN_LIBS = %%FORTRAN_LIBS%%
++PTHERAD_LIBS = %%PTHREAD_LIBS%%
  
--LAPACK_LIB =  -llapack -lcblaswr -lcblas \
--              -lf77blas -lI77 -lF77 -latlas
-+LAPACK_LIB = %%LAPACK%% %%BLAS%% %%GCCLIBDIR%% %%FORTRANLIBS%%
- 
- # if you use BLAS in clapack.tgz, use next line
- # and set NON_ATLAS_SDPA in rsdpa_include.h to 1.
-@@ -36,10 +35,12 @@
- #RSDPA_LIB_NAME = rsdpa
- RSDPA_LIB = -l$(RSDPA_LIB_NAME)
- 
--MPIBIN=
--CC = $(MPIBIN)mpicxx
-+MPIBIN= %%LOCALBASE%%/mpich2/bin/
-+CC = $(MPIBIN)mpicxx
- F77 = $(MPIBIN)mpif77
- OPTION = -O3  #-g
-+FFLAGS = %%FFLAGS%%
-+CXXFLAGS = %%CXXFLAGS%% -DMPICH_IGNORE_CXX_SEEK
- 
- TARGET_EXE = $(RSDPA_LIB_NAME)
- #TARGET_EXE = rsdpa_main.exe
-@@ -60,9 +61,9 @@
- 	  -L$(LAPACK)/lib $(SCALAPACK_LIB) $(LAPACK_LIB)
- 
- .cpp.o:
--	$(CC) $(OPTION) -c -I$(RSDPA) -I$(LAPACK)/include $<
-+	$(CC) $(CXXFLAGS) -c -I$(RSDPA) -I$(LAPACK)/include $<
- .f.o:
--	$(F77) $(OPTION) -c $<
-+	$(F77) $(FFLAGS) -c $<
- 
- force: clean now
- forceall: clean all
+ # F77_FUNC 
+ DEF_F77_FUNC = -DF77_FUNC\(name,NAME\)=name\ \#\#\ _ 
diff --git a/math/sdpara/files/patch-extraqualification b/math/sdpara/files/patch-extraqualification
deleted file mode 100644
index 2d440337376c..000000000000
--- a/math/sdpara/files/patch-extraqualification
+++ /dev/null
@@ -1,13 +0,0 @@
---- rsdpa_cg.h~	Thu Sep  2 13:32:37 2004
-+++ rsdpa_cg.h	Thu Jan 11 17:09:35 2007
-@@ -40,8 +40,8 @@
-   int descr[DLEN1_];
-   
- 
--  rCg::rCg();
--  rCg::~rCg();
-+  rCg();
-+  ~rCg();
-   int initialize(int m, double* A, int* descA,
- 		 double* x, int* descx);
- 
diff --git a/math/sdpara/files/patch-mumps+Makefile b/math/sdpara/files/patch-mumps+Makefile
new file mode 100644
index 000000000000..bb428bc0715b
--- /dev/null
+++ b/math/sdpara/files/patch-mumps+Makefile
@@ -0,0 +1,21 @@
+--- mumps/Makefile~	2009-02-17 14:12:26.000000000 +0900
++++ mumps/Makefile	2009-02-17 14:12:54.000000000 +0900
+@@ -6,12 +6,12 @@
+ # The following variables are set from SDPA_MAKEFILE
+ ###################################################################
+ 
+-CC          = ${shell grep "^CC"       ${SDPA_MAKEFILE} | cut -f2- -d=}
+-CFLAGS      = ${shell grep "^CFLAGS"   ${SDPA_MAKEFILE} | cut -f2- -d=}
+-CXX         = ${shell grep "^CXX"      ${SDPA_MAKEFILE} | cut -f2- -d=}
+-CXXFLAGS    = ${shell grep "^CXXFLAGS" ${SDPA_MAKEFILE} | cut -f2- -d=}
+-FC          = ${shell grep "^FC"       ${SDPA_MAKEFILE} | cut -f2- -d=}
+-FFLAGS      = ${shell grep "^FFLAGS"   ${SDPA_MAKEFILE} | cut -f2- -d=}
++CC          = %%MPICC%%
++CFLAGS      = %%CFLAGS%%
++CXX         = %%MPICXX%%
++CXXFLAGS    = %%CXXFLAGS%%
++FC          = %%MPIF77%%
++FFLAGS      = %%FFLAGS%%
+ 
+ ###################################################################
+ 
diff --git a/math/sdpara/files/patch-rsdpa_include.h b/math/sdpara/files/patch-rsdpa_include.h
deleted file mode 100644
index fd8d39bd5a09..000000000000
--- a/math/sdpara/files/patch-rsdpa_include.h
+++ /dev/null
@@ -1,19 +0,0 @@
---- rsdpa_include.h.orig	Sat Nov  2 11:10:59 2002
-+++ rsdpa_include.h	Sun Aug  3 09:07:52 2003
-@@ -21,13 +21,13 @@
- #include <cstring>
- 
- extern "C" {
--#include <f2c.h>
-+#include <g2c.h>
- #if NON_ATLAS_SDPA
- #include <blaswrap.h>
- #endif
--#include <fblaswr.h>
- #include <cblas.h>
--#include <clapack.h>
-+#include <blas.h>
-+#include <lapack.h>
- };
- 
- using namespace std;