diff options
| author | Stefan Walter <stefan@FreeBSD.org> | 2008-12-12 14:39:50 +0000 |
|---|---|---|
| committer | Stefan Walter <stefan@FreeBSD.org> | 2008-12-12 14:39:50 +0000 |
| commit | 3384170f282e73803d3526ffdf02b87c082a9026 (patch) | |
| tree | ee97a50fa395289aab53cf068de7c9a5969d5832 /math/arpack++/files/patch-Makefile.inc | |
| parent | Update to 0.3.1. (diff) | |
Integrate a patch from http://reuter.mit.edu/index.php/software/arpackpatch/
which fixes ARPACK++ 1.2 to work with g++ 4.0.2 and above.
PR: 121194
Submitted by: "Reed A. Cartwright" <reed@scit.us>
Patch by: stefan
Diffstat (limited to 'math/arpack++/files/patch-Makefile.inc')
| -rw-r--r-- | math/arpack++/files/patch-Makefile.inc | 51 |
1 files changed, 25 insertions, 26 deletions
diff --git a/math/arpack++/files/patch-Makefile.inc b/math/arpack++/files/patch-Makefile.inc index 13365323498c..720b6003aa2b 100644 --- a/math/arpack++/files/patch-Makefile.inc +++ b/math/arpack++/files/patch-Makefile.inc @@ -1,6 +1,6 @@ ---- Makefile.inc.orig Wed Apr 5 14:00:59 2000 -+++ Makefile.inc Mon Oct 20 21:56:56 2003 -@@ -1,25 +1,27 @@ +--- Makefile.inc.orig 2008-12-12 15:10:18.000000000 +0100 ++++ Makefile.inc 2008-12-12 15:12:13.000000000 +0100 +@@ -1,26 +1,27 @@ -# ARPACK++ v1.2 2/18/2000 +# ARPACK++ v1.2 2/20/2000 +# $FreeBSD$ @@ -12,7 +12,7 @@ # Defining the machine. --PLAT = solaris +-PLAT = linux +PLAT = `uname -s` # Defining the compiler. @@ -24,36 +24,35 @@ # ARPACKPP_INC is the directory that contains all arpack++ header files. # SUPERLU_DIR and UMFPACK_DIR must be set to ARPACKPP_INC. --ARPACKPP_DIR = $(HOME)/arpack++ +-#ARPACKPP_DIR = $(HOME)/arpack++ +-ARPACKPP_DIR = ../../.. -ARPACKPP_INC = $(ARPACKPP_DIR)/include -SUPERLU_DIR = $(ARPACKPP_INC) -UMFPACK_DIR = $(ARPACKPP_INC) -+ARPACK_INC = %%LOCALBASE%%/include -+ARPACKPP_DIR = %%LOCALBASE%% ++ARPACK_INC = /usr/local/include ++ARPACKPP_DIR = /usr/local +ARPACKPP_INC = $(ARPACKPP_DIR)/include/ARPACK++ -+SUPERLU_DIR = %%LOCALBASE%%/include/superlu -+UMFPACK_DIR = %%LOCALBASE%%/include/UMFPACK ++SUPERLU_DIR = /usr/local/include/superlu ++UMFPACK_DIR = /usr/local/include/UMFPACK # Defining ARPACK, LAPACK, UMFPACK, SUPERLU, BLAS and FORTRAN libraries. # See the arpack++ manual or the README file for directions on how to -@@ -33,31 +35,26 @@ +@@ -34,29 +35,26 @@ # Other libraries should be defined if the user intends to compile # arpack++ on another environment. --ARPACK_LIB = $(HOME)/lib/arpack_$(PLAT).a --LAPACK_LIB = /opt/LAPACK/lapack_$(PLAT).a --UMFPACK_LIB = $(HOME)/lib/umfpack_$(PLAT).a --SUPERLU_LIB = $(HOME)/lib/superlu_$(PLAT).a --BLAS_LIB = /opt/LAPACK/blas_$(PLAT).a --FORTRAN_LIBS = /opt/SUNWspro/SC4.0/lib/libF77.a \ -- /opt/SUNWspro/SC4.0/lib/libM77.a \ -- /opt/SUNWspro/SC4.0/lib/libsunmath.a -+ARPACK_LIB = %%LOCALBASE%%/lib/libarpack.a -+LAPACK_LIB = %%LOCALBASE%%/lib/liblapack.a -+UMFPACK_LIB = %%LOCALBASE%%/lib/libumfpack.a -+SUPERLU_LIB = %%LOCALBASE%%/lib/libsuperlu.a -+BLAS_LIB = %%LOCALBASE%%/lib/libf77blas.a %%LOCALBASE%%/lib/libatlas.a -+FORTRAN_LIBS = -lg2c +-ARPACK_LIB = -larpack +-LAPACK_LIB = -llapack +-UMFPACK_LIB = #-lumfpack +-SUPERLU_LIB = /usr/lib/libsuperlu.a +-BLAS_LIB = -lblas +-FORTRAN_LIBS = -lg2c ++ARPACK_LIB = /usr/local/lib/libarpack.a ++LAPACK_LIB = /usr/local/lib/liblapack.a ++UMFPACK_LIB = /usr/local/lib/libumfpack.a ++SUPERLU_LIB = /usr/local/lib/libsuperlu.a ++BLAS_LIB = /usr/local/lib/libf77blas.a /usr/local/lib/libatlas.a ++FORTRAN_LIBS = -L/usr/local/lib/gcc-4.2.5 -lgfortran # Defining g++ flags and directories. @@ -63,10 +62,10 @@ CPP_DEBUG = -g -CPP_OPTIM = -O -CPP_LIBS = --CPP_INC = /usr/local/include/g++-3 +-CPP_INC = +#CPP_OPTIM = -O +CPP_LIBS = -lm -+CPP_INC = %%LOCALBASE%%/include ++CPP_INC = /usr/local/include -CPP_FLAGS = $(CPP_DEBUG) -D$(PLAT) -I$(ARPACKPP_INC) -I$(CPP_INC) \ - $(CPP_WARNINGS) |