[92136] trunk/dports/math/arpack
mmoll at macports.org
mmoll at macports.org
Thu Apr 19 12:56:46 PDT 2012
Revision: 92136
https://trac.macports.org/changeset/92136
Author: mmoll at macports.org
Date: 2012-04-19 12:56:46 -0700 (Thu, 19 Apr 2012)
Log Message:
-----------
math/arpack: enable openmpi by default (remove variant), since the build system seems to assume it. remove unused patch.
Modified Paths:
--------------
trunk/dports/math/arpack/Portfile
Removed Paths:
-------------
trunk/dports/math/arpack/files/patch-arpack.diff
Modified: trunk/dports/math/arpack/Portfile
===================================================================
--- trunk/dports/math/arpack/Portfile 2012-04-19 19:51:53 UTC (rev 92135)
+++ trunk/dports/math/arpack/Portfile 2012-04-19 19:56:46 UTC (rev 92136)
@@ -5,6 +5,7 @@
name arpack
version 3.1.0
+revision 1
categories math
license BSD
platforms darwin
@@ -22,6 +23,17 @@
rmd160 b0cd379933bfda53655da9def5b21a00ff9c97d1
worksrcdir ${name}-ng_${version}
+# openmpi does not have a universal variant
+universal_variant no
+depends_build port:openmpi
+configure.args-append --enable-mpi home=${worksrcpath}
+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'
+}
+configure.env-append MPIF77=${prefix}/bin/openmpif77
+
pre-fetch {
if {"darwin" == ${os.platform} && ${os.major} < 9} {
ui_error "${name} ${version} requires Mac OS X 10.5 or greater"
@@ -29,6 +41,7 @@
}
}
+
# Fortran compilers can not cross-compile
if { ${os.arch}=="i386" } {
set universal_archs_supported "i386 x86_64"
@@ -36,25 +49,6 @@
set universal_archs_supported "ppc ppc64"
}
-if { ! [variant_isset universal]} {
- configure.args-append home=${worksrcpath}
- 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'
- }
-} else {
- foreach arch {x86_64 i386 ppc ppc64} {
- set merger_build_args(${arch}) home=${worksrcpath}-${arch}
- set merger_dont_diff "${prefix}/lib/libarpack.la ${prefix}/lib/libparpack.la"
- if { ${arch}=="x86_64" || ${arch}=="ppc64" } {
- lappend merger_configure_args(${arch}) FFLAGS='-O2 -m64' LDFLAGS='-L${prefix}/lib'
- } else {
- lappend merger_configure_args(${arch}) FFLAGS='-O2 -m32' LDFLAGS='-L${prefix}/lib'
- }
- }
-}
-
variant gcc42 description {build with gfortran-mp-4.2} conflicts gcc43 gcc44 gcc45 gcc46 gcc47 g95 universal {
depends_build-append port:gcc42
configure.env-append F77=${prefix}/bin/gfortran-mp-4.2
@@ -93,17 +87,6 @@
default_variants +gcc45
}
-variant openmpi description {build PARPACK, the parallel eigenvalue solver library} conflicts universal {
- pre-fetch {
- if {![file exists ${prefix}/bin/openmpif77]} {
- return -code error "Please install one of the following variants of the openmpi port: gcc42, gcc43, gcc44, gcc45."
- }
- }
- depends_build port:openmpi
- configure.args-append --enable-mpi
- configure.env-append MPIF77=${prefix}/bin/openmpif77
-}
-
variant accelerate conflicts atlas description {build with Accelerate framework} {
configure.args-append --with-lapack=/usr/lib/liblapack.dylib
}
Deleted: trunk/dports/math/arpack/files/patch-arpack.diff
===================================================================
--- trunk/dports/math/arpack/files/patch-arpack.diff 2012-04-19 19:51:53 UTC (rev 92135)
+++ trunk/dports/math/arpack/files/patch-arpack.diff 2012-04-19 19:56:46 UTC (rev 92136)
@@ -1,90 +0,0 @@
---- ./ARmake.inc 2007-03-29 16:08:05.000000000 +0200
-+++ ./ARmake.inc 2007-03-29 16:08:15.000000000 +0200
-@@ -34,6 +34,11 @@
- #
- PLAT = SUN4
- #
-+# The communication library ( need for parallel library only )
-+# Current availible platforms are: BLACS or MPI
-+#
-+COMMLIB = MPI
-+#
- # %------------------------------------------------------%
- # | The directories to find the various pieces of ARPACK |
- # %------------------------------------------------------%
-@@ -42,6 +47,8 @@
- LAPACKdir = $(home)/LAPACK
- UTILdir = $(home)/UTIL
- SRCdir = $(home)/SRC
-+PSRCdir = $(home)/PARPACK/SRC/$(COMMLIB)
-+PUTILdir = $(home)/PARPACK/UTIL/$(COMMLIB)
- #
- DIRS = $(BLASdir) $(LAPACKdir) $(UTILdir) $(SRCdir)
- #
-@@ -51,17 +58,21 @@
- # | NOTE: ARPACK assumes the use of LAPACK version 2 codes. |
- # %-------------------------------------------------------------------%
- #
--#DIRS = $(UTILdir) $(SRCdir)
-+DIRS = $(UTILdir) $(SRCdir)
- #
- # %---------------------------------------------------%
- # | The name of the libraries to be created/linked to |
- # %---------------------------------------------------%
- #
--ARPACKLIB = $(home)/libarpack_$(PLAT).a
--LAPACKLIB =
-+ARPACKLIB = $(home)/libarpack.a
-+PARPACKLIB = $(home)/libparpack.a
-+LAPACKLIB = -framework Accelerate
- BLASLIB =
- #
- ALIBS = $(ARPACKLIB) $(LAPACKLIB) $(BLASLIB)
-+MPILIBS =
-+PLIBS = $(PARPACKLIB) $(ALIBS) $(MPILIBS)
-+
- #
- #
- # %---------------------------------------------------------%
-@@ -102,7 +113,7 @@
- # %-----------------------------------------%
- #
- FC = f77
--FFLAGS = -O -cg89
-+FFLAGS = -O2 -ff2c
-
- LDFLAGS =
- CD = cd
-@@ -112,7 +123,7 @@
- LN = ln
- LNFLAGS = -s
-
--MAKE = /bin/make
-+MAKE = make
-
- RM = rm
- RMFLAGS = -f
-diff -rubw ARPACK.orig/ARPACK/UTIL/second.f ARPACK/UTIL/second.f
---- ./UTIL/second.f 2007-03-29 16:08:05.000000000 +0200
-+++ ./UTIL/second.f 2007-03-29 16:08:15.000000000 +0200
-@@ -20,15 +20,15 @@
- REAL TARRAY( 2 )
- * ..
- * .. External Functions ..
-- REAL ETIME
-- EXTERNAL ETIME
-+* REAL ETIME
-+* EXTERNAL ETIME
- * ..
- * .. Executable Statements ..
- *
-
-- T1 = ETIME( TARRAY )
-- T = TARRAY( 1 )
--
-+* T1 = ETIME( TARRAY )
-+* T = TARRAY( 1 )
-+ T = 1
- RETURN
- *
- * End of SECOND
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120419/1f29775f/attachment.html>
More information about the macports-changes
mailing list