diff options
| author | thierry <thierry@FreeBSD.org> | 2006-07-24 16:39:17 +0800 |
|---|---|---|
| committer | thierry <thierry@FreeBSD.org> | 2006-07-24 16:39:17 +0800 |
| commit | 1e5f8ae6a7815230b2dd76cef7260ffebfc2680f (patch) | |
| tree | 7806562674bee79a1705e8ba6289cb7f7552a7e8 /math | |
| parent | 03114329b2546a520843d8d02b23cf956692e25a (diff) | |
| download | freebsd-ports-graphics-1e5f8ae6a7815230b2dd76cef7260ffebfc2680f.tar.gz freebsd-ports-graphics-1e5f8ae6a7815230b2dd76cef7260ffebfc2680f.tar.zst freebsd-ports-graphics-1e5f8ae6a7815230b2dd76cef7260ffebfc2680f.zip | |
- Force the detection of f77, and thus remove a superfluous patch; (1)
- Fix blacs usage. (2)
Submitted by: Satish Balay <petsc-maint (at) mcs.anl.gov>
Diffstat (limited to 'math')
| -rw-r--r-- | math/petsc/Makefile | 21 | ||||
| -rw-r--r-- | math/petsc/files/patch-python_PETSc_packages_BlasLapack.py | 23 |
2 files changed, 14 insertions, 30 deletions
diff --git a/math/petsc/Makefile b/math/petsc/Makefile index da382471f61..56830efa60b 100644 --- a/math/petsc/Makefile +++ b/math/petsc/Makefile @@ -7,6 +7,7 @@ PORTNAME= petsc DISTVERSION= 2.3.1-p16 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= math parallel MASTER_SITES= ftp://ftp.mcs.anl.gov/pub/petsc/release-snapshots/ @@ -24,7 +25,8 @@ CONFIGURE_ENV= PETSC_ARCH=${TARGET} \ PETSC_DIR=${WRKSRC} CONFIGURE_ARGS= --prefix=${PREFIX}/${PFX} --COPTFLAGS="${CFLAGS}" \ --CXXOPTFLAGS="${CXXFLAGS}" --FOPTFLAGS="${FFLAGS}" \ - --with-shared=1 + --with-shared=1 --with-cc=${CC} --with-fc=${F77} \ + --CPPFLAGS="-I${LOCALBASE}/include" ALL_TARGET= all MAKEFILE= makefile MAKE_ENV= PETSC_DIR=${WRKSRC} @@ -67,6 +69,10 @@ MPIDIR= ${LOCALBASE}/mpich2 WITHOUT_SUPERLU= yes .endif +.if !${OSVERSION} < 500039 +F77?= f77 +.endif + .if exists(${MPIDIR}/bin/mpicc) && !defined(WITHOUT_MPI) WITH_MPI= yes .endif @@ -113,7 +119,7 @@ CONFIGURE_ARGS+= --with-superlu-include=${LOCALBASE}/include/superlu \ CONFIGURE_ARGS+= --with-blocksolve95=0 .else BUILD_DEPENDS+= ${LOCALBASE}/lib/libBS95.a:${PORTSDIR}/math/blocksolve95 -CONFIGURE_ARGS+= --with-blocksolve95-include=${LOCALBASE}/include \ +CONFIGURE_ARGS+= --with-blocksolve95-include=${LOCALBASE}/mpich2/include \ --with-blocksolve95-lib=${LOCALBASE}/lib/libBS95.a .endif @@ -129,17 +135,18 @@ CONFIGURE_ARGS+= --with-parmetis=1 \ .if exists(${LIBBLACS}) WITH_BLACS= yes .endif -.if defined(WITH_BLACS) && !defined(WITH_MPI) +.if defined(WITH_BLACS) && defined(WITH_MPI) BUILD_DEPENDS+= ${LIBBLACS}:${PORTSDIR}/math/blacs -CONFIGURE_ARGS+= --with_mumps=0 \ +CONFIGURE_ARGS+= --with_blacs=1 \ --with-blacs-include=${LOCALBASE}/include \ - --with-blacs-lib=[${LOCALBASE}/lib/libblacs.a,${LOCALBASE}/lib/libblacsc.a,${LOCALBASE}/lib/libblacsf77.a] -. if exists(${LIBSCALAPACK}) + --with-blacs-lib=[${LOCALBASE}/lib/libblacsc.a,${LOCALBASE}/lib/libblacsf77.a,${LOCALBASE}/lib/libblacs.a] +. if exists(${LIBSCALAPACK}) && defined(WITH_MPI) WITH_SCALAPACK= yes . endif . if defined(WITH_SCALAPACK) BUILD_DEPENDS+= ${LIBSCALAPACK}:${PORTSDIR}/math/scalapack -CONFIGURE_ARGS+= --with-scalapack-dir=${LOCALBASE} +CONFIGURE_ARGS+= --with-scalapack=1 \ + --with-scalapack-dir=${LOCALBASE} . endif .endif diff --git a/math/petsc/files/patch-python_PETSc_packages_BlasLapack.py b/math/petsc/files/patch-python_PETSc_packages_BlasLapack.py deleted file mode 100644 index 0f18156cfeb..00000000000 --- a/math/petsc/files/patch-python_PETSc_packages_BlasLapack.py +++ /dev/null @@ -1,23 +0,0 @@ ---- python/PETSc/packages/BlasLapack.py.orig Fri Jul 21 04:44:48 2006 -+++ python/PETSc/packages/BlasLapack.py Sat Jul 22 13:57:25 2006 -@@ -117,14 +117,13 @@ - foundBlas = self.checkBlas(blasLibrary, self.getOtherLibs(foundBlas, blasLibrary), mangleFunc) - if foundBlas: - foundLapack = self.checkLapack(lapackLibrary, self.getOtherLibs(foundBlas, blasLibrary), mangleFunc) -- elif not hasattr(self.compilers, 'FC'): -- self.framework.logPrint('Checking cblaslapack') -- foundcBlasLapack = self.checkBlas(blasLibrary, self.getOtherLibs(foundBlas, blasLibrary), 0, 'f2cblaslapack_id_') -- if foundcBlasLapack: -- foundBlas = self.checkBlas(blasLibrary, self.getOtherLibs(foundBlas, blasLibrary), 0, 'ddot_') -+ else: -+ self.framework.logPrint('Checking cblaslapack name-mangling') -+ foundBlas = self.checkBlas(blasLibrary, self.getOtherLibs(foundBlas, blasLibrary), 0, 'ddot_') -+ if foundBlas: -+ self.framework.logPrint('Found cblaslapack') - foundLapack = self.checkLapack(lapackLibrary, self.getOtherLibs(foundBlas, blasLibrary), 0, ['dgetrs_', 'dgeev_']) -- if foundBlas and foundLapack: -- self.framework.logPrint('Found cblaslapack') -+ if foundLapack: - self.f2c = 1 - return (foundBlas, foundLapack) - |