[106725] trunk/dports/math/arpack
mmoll at macports.org
mmoll at macports.org
Thu Jun 6 11:17:05 PDT 2013
Revision: 106725
https://trac.macports.org/changeset/106725
Author: mmoll at macports.org
Date: 2013-06-06 11:17:05 -0700 (Thu, 06 Jun 2013)
Log Message:
-----------
math/arpack: allow arpack to build without mpi. closes #39352
Modified Paths:
--------------
trunk/dports/math/arpack/Portfile
Removed Paths:
-------------
trunk/dports/math/arpack/files/patch-configure-atlas.diff
Modified: trunk/dports/math/arpack/Portfile
===================================================================
--- trunk/dports/math/arpack/Portfile 2013-06-06 17:11:52 UTC (rev 106724)
+++ trunk/dports/math/arpack/Portfile 2013-06-06 18:17:05 UTC (rev 106725)
@@ -13,7 +13,7 @@
description Package for solving large scale eigenvalue problems
long_description \
ARPACK is a collection of Fortran77 subroutines designed to solve large \
- scale eigenvalue problems.
+ scale eigenvalue problems. Parallel ARPACK (PARPACK) is included if built with an MPI variant.
homepage http://forge.scilab.org/index.php/p/arpack-ng
master_sites ${homepage}/downloads/497
distfiles get
@@ -23,23 +23,21 @@
rmd160 2c55eca384cc0a1aebacdef527f88426932bf57b
worksrcdir ${name}-ng_${version}
-# openmpi does not have a universal variant
-universal_variant no
-configure.args-append --enable-mpi home=${worksrcpath}
+configure.args-append home=${worksrcpath} --disable-mpi
+# LDFLAGS needs to be defined here to avoid it having also a "-arch" option, considered illegal by gfortran
if { ${build_arch}=="x86_64" || ${build_arch}=="ppc64" } {
configure.args-append FFLAGS='-O2 -m64' LDFLAGS='-L${prefix}/lib'
} else {
configure.args-append FFLAGS='-O2 -m32' LDFLAGS='-L${prefix}/lib'
}
-pre-fetch {
- if {"darwin" == ${os.platform} && ${os.major} < 9} {
- ui_error "${name} ${version} requires Mac OS X 10.5 or greater"
- return -code error "incompatible Mac OS X version"
- }
+pre-fetch {
+ if {"darwin" == ${os.platform} && ${os.major} < 9} {
+ ui_error "${name} ${version} requires Mac OS X 10.5 or greater"
+ return -code error "incompatible Mac OS X version"
+ }
}
-
# Fortran compilers can not cross-compile
if { ${os.arch}=="i386" } {
set universal_archs_supported "i386 x86_64"
@@ -47,14 +45,18 @@
set universal_archs_supported "ppc ppc64"
}
-variant openmpi description {build with OpenMPI} conflicts mpich {
- depends_lib-append port:openmpi
- configure.env-append MPIF77=${prefix}/bin/openmpif77
+variant openmpi description {build PARPACK, with OpenMPI} conflicts mpich universal {
+ depends_lib-append port:openmpi
+ configure.args-delete --disable-mpi
+ configure.args-append --enable-mpi
+ configure.env-append MPIF77=${prefix}/bin/openmpif77
}
-variant mpich description {build with MPICH} conflicts openmpi {
- depends_lib-append path:bin/mpicc:mpich
- configure.env-append MPIF77=${prefix}/bin/mpif77
+variant mpich description {build PARPACK, with MPICH} conflicts openmpi {
+ depends_lib-append path:bin/mpif77:mpich
+ configure.args-delete --disable-mpi
+ configure.args-append --enable-mpi
+ configure.env-append MPIF77=${prefix}/bin/mpif77
}
if {![variant_isset mpich]} {
@@ -95,9 +97,8 @@
default_variants +gcc47
}
-# warning: this is ignored if atlas is installed
variant accelerate conflicts atlas description {build with Accelerate framework} {
- configure.args-append --with-lapack=/usr/lib/liblapack.dylib
+ configure.args-append --with-blas=/usr/lib/libblas.dylib --with-lapack=/usr/lib/liblapack.dylib
patchfiles-append patch-ARPACK-cdot-and-zdot.diff
if {[variant_isset openmpi] || [variant_isset mpich]} {
patchfiles-append patch-PARPACK-cdot-and-zdot.diff
@@ -106,8 +107,7 @@
variant atlas description {build with atlas} {
depends_lib-append port:atlas
- patchfiles-append patch-configure-atlas.diff
- configure.args-append --with-lapack=${prefix}/lib/libtatlas.dylib
+ configure.args-append --with-blas=${prefix}/lib/libsatlas.dylib
}
if {![variant_isset atlas]} {
Deleted: trunk/dports/math/arpack/files/patch-configure-atlas.diff
===================================================================
--- trunk/dports/math/arpack/files/patch-configure-atlas.diff 2013-06-06 17:11:52 UTC (rev 106724)
+++ trunk/dports/math/arpack/files/patch-configure-atlas.diff 2013-06-06 18:17:05 UTC (rev 106725)
@@ -1,46 +0,0 @@
---- configure.orig 2012-06-08 11:18:01.000000000 -0500
-+++ configure 2012-06-08 11:18:32.000000000 -0500
-@@ -14917,13 +14917,13 @@
-
- # BLAS in ATLAS library? (http://math-atlas.sourceforge.net/)
- if test $ax_blas_ok = no; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ATL_xerbla in -latlas" >&5
--$as_echo_n "checking for ATL_xerbla in -latlas... " >&6; }
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ATL_xerbla in -ltatlas" >&5
-+$as_echo_n "checking for ATL_xerbla in -ltatlas... " >&6; }
- if ${ac_cv_lib_atlas_ATL_xerbla+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-latlas $LIBS"
-+LIBS="-ltatlas $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
-@@ -14969,7 +14969,7 @@
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lf77blas -latlas $LIBS"
-+LIBS="-lf77blas -ltatlas $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
-@@ -15015,7 +15015,7 @@
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lcblas -lf77blas -latlas $LIBS"
-+LIBS="-lcblas -lf77blas -ltatlas $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
-@@ -15055,7 +15055,7 @@
- $as_echo "$ac_cv_lib_cblas_cblas_dgemm" >&6; }
- if test "x$ac_cv_lib_cblas_cblas_dgemm" = xyes; then :
- ax_blas_ok=yes
-- BLAS_LIBS="-lcblas -lf77blas -latlas"
-+ BLAS_LIBS="-lcblas -lf77blas -ltatlas"
- fi
-
- fi
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130606/5a01eeb1/attachment-0001.html>
More information about the macports-changes
mailing list