[98584] trunk/dports/science
eborisch at macports.org
eborisch at macports.org
Tue Oct 9 05:58:02 PDT 2012
Revision: 98584
http://trac.macports.org//changeset/98584
Author: eborisch at macports.org
Date: 2012-10-09 05:58:01 -0700 (Tue, 09 Oct 2012)
Log Message:
-----------
mpich2[-devel]: update to 1.5
Modified Paths:
--------------
trunk/dports/science/mpich2/Portfile
trunk/dports/science/mpich2-devel/Portfile
Removed Paths:
-------------
trunk/dports/science/mpich2/files/
Modified: trunk/dports/science/mpich2/Portfile
===================================================================
--- trunk/dports/science/mpich2/Portfile 2012-10-09 11:12:30 UTC (rev 98583)
+++ trunk/dports/science/mpich2/Portfile 2012-10-09 12:58:01 UTC (rev 98584)
@@ -4,8 +4,11 @@
PortSystem 1.0
name mpich2
-version 1.4.1p1
-revision 1
+set pkgname mpich2
+version 1.5
+revision 0
+# Added to keep in line with mpich2-devel
+epoch 20121008
license BSD
categories science parallel net
platforms darwin
@@ -24,116 +27,114 @@
homepage http://www.mcs.anl.gov/research/projects/mpich2/
master_sites ${homepage}downloads/tarballs/${version}/
+distname ${pkgname}-${version}
-checksums md5 b470666749bcb4a0449a072a18e2c204 \
- sha1 8dcc8888fb27232eb8f76c11cc890f1c3c483804 \
- rmd160 1d355cc07b8675af77b1c255fd10696844447298
+checksums \
+ rmd160 69572f5c435aec1ef37af197f7509cfc073ce53a \
+ sha256 7175926fc2e4230f00201e880318c08de4f949c0dbe167fe1b2e256ac79d5f66
+depends_lib-append port:libxml2
+
# Don't build if lammpi is around.
pre-configure {
if {[file exists ${prefix}/etc/lammpi/lam-helpfile]} {
- ui_error "Cannot co-exist with lammpi; please deactivate lammpi before configuring."
+ ui_error \
+ "Cannot co-exist with lammpi; please deactivate lammpi before configuring."
return -code error
}
}
pre-build {
if {[file exists ${prefix}/etc/lammpi/lam-helpfile]} {
- ui_error "Cannot co-exist with lammpi; please deactivate lammpi before building."
+ ui_error \
+ "Cannot co-exist with lammpi; please deactivate lammpi before building."
return -code error
}
}
-# Puts all entries in <prefix>/share into appropriate mpich2 subdirs
-destroot.args PACKAGE=mpich2
-patchfiles patch-src-util-createshlib.in
-
-# the default include-dir conflicts with openmpi!
-configure.args --with-thread-package=posix \
- --enable-timer-type=mach_absolute_time \
+configure.args --disable-dependency-tracking \
+ --disable-f77 \
+ --disable-fc \
+ --disable-silent-rules \
+ --enable-alloca \
+ --enable-base-cache \
+ --enable-cache \
--enable-cxx \
- --mandir=${prefix}/share/man \
- --docdir=${prefix}/share/doc/${name} \
- --htmldir=${prefix}/share/doc/${name} \
- --includedir=${prefix}/include/${name} \
- --disable-f77 --disable-fc \
+ --enable-fast=O2 \
+ --enable-shared \
+ --enable-smpcoll \
+ --includedir=${prefix}/include/${pkgname} \
+ --with-device=ch3:nemesis \
--with-mpe \
- --with-device=ch3:nemesis \
+ --with-pm=hydra \
+ --with-thread-package=posix \
"F90FLAGS='' F90=''" \
- --with-pm=hydra \
- --enable-shared \
- --enable-cache \
- --enable-smpcoll \
- --enable-base-cache
+ MPICH2LIB_CPPFLAGS=-I${prefix}/include
-build.args-append VERBOSE=1
+platform darwin {
+ configure.args-append --enable-timer-type=mach_absolute_time
+}
+
+# We're making compiler wrappers here... don't default to -O2 for wrappers.
+# Actual library code is compiled with -O2 via --enable-fast=O2 configure arg
+configure.cflags-delete -O2
+configure.cxxflags-delete -O2
+configure.fflags-delete -O2
+configure.fcflags-delete -O2
+configure.cppflags-delete -I${prefix}/include
+
universal_variant no
-use_parallel_build no
conflicts lammpi \
- mpich2-devel
+ mpich2
-# Fixes for the beta DESTDIR support in 1.4.1. Should go away in 1.5 branch.
-post-patch {
- reinplace -E "s|fix=\\\$\\\{DESTDIR\\\}|fix=|g" \
- ${worksrcpath}/Makefile.in
- reinplace -E "s|dir=\\\$\\\{DESTDIR\\\}|dir=|g" \
- ${worksrcpath}/Makefile.in
-}
-
post-destroot {
- reinplace -E "s|${destroot}||g" ${destroot}${prefix}/bin/mpicxx \
- ${destroot}${prefix}/bin/mpicc \
- ${destroot}${prefix}/etc/mpicxx.conf \
- ${destroot}${prefix}/etc/mpicc.conf
- if {[ variant_isset gcc43 ] ||
- [ variant_isset gcc44 ] ||
- [ variant_isset gcc45 ] ||
- [ variant_isset gcc46 ] ||
- [ variant_isset gcc47 ]} {
- reinplace -E "s|${destroot}||g" ${destroot}${prefix}/bin/mpif77 \
- ${destroot}${prefix}/bin/mpif90 \
- ${destroot}${prefix}/etc/mpif77.conf \
- ${destroot}${prefix}/etc/mpif90.conf
- }
+ # Move examples directories to preferred location
+ move ${destroot}${prefix}/share/examples \
+ ${destroot}${prefix}/share/doc/${pkgname}/examples
+ # Remove un-needed (in MacPorts) binaries
file delete ${destroot}${prefix}/sbin/mpeuninstall
+ file delete ${destroot}${prefix}/sbin/mpecheckinstall
+
+ # That's what man pages are for
+ delete ${destroot}${prefix}/share/doc/www4
}
# As MPICH creates compiler wrappers, there are lots of
# variants for what compiler the user would like to wrap.
variant gcc47 description {
- Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc47
-} conflicts gcc43 gcc44 gcc45 gcc46 llvm clang {
+ Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc47 port
+} conflicts gcc43 gcc44 gcc45 gcc46 llvm clang clang31 {
depends_lib-append port:gcc47
configure.compiler macports-gcc-4.7
}
variant gcc46 description {
- Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc46
-} conflicts gcc43 gcc44 gcc45 gcc47 llvm clang {
+ Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc46 port
+} conflicts gcc43 gcc44 gcc45 gcc47 llvm clang clang31 {
depends_lib-append port:gcc46
configure.compiler macports-gcc-4.6
}
variant gcc45 description {
- Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc45
-} conflicts gcc43 gcc44 gcc46 gcc47 llvm clang {
+ Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc45 port
+} conflicts gcc43 gcc44 gcc46 gcc47 llvm clang clang31 {
depends_lib-append port:gcc45
configure.compiler macports-gcc-4.5
}
variant gcc44 description {
- Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc44
-} conflicts gcc43 gcc45 gcc46 gcc47 llvm clang {
+ Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc44 port
+} conflicts gcc43 gcc45 gcc46 gcc47 llvm clang clang31 {
depends_lib-append port:gcc44
configure.compiler macports-gcc-4.4
}
variant gcc43 description {
- Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc43
-} conflicts gcc44 gcc45 gcc46 gcc47 llvm clang {
+ Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc43 port
+} conflicts gcc44 gcc45 gcc46 gcc47 llvm clang clang31 {
depends_lib-append port:gcc43
configure.compiler macports-gcc-4.3
}
@@ -149,19 +150,25 @@
variant llvm description {
Use llvm-gcc
-} conflicts gcc43 gcc44 gcc45 gcc46 gcc47 clang {
+} conflicts gcc43 gcc44 gcc45 gcc46 gcc47 clang clang31 {
configure.compiler llvm-gcc-4.2
}
variant clang description {
Use clang
-} conflicts gcc43 gcc44 gcc45 gcc46 gcc47 llvm {
+} conflicts gcc43 gcc44 gcc45 gcc46 gcc47 llvm clang31 {
configure.compiler clang
- configure.cxx clang++
- configure.cflags-append -w
- configure.cxxflags-append -w
}
+variant clang31 description {
+ Use clang 3.1 from MacPorts
+} conflicts gcc43 gcc44 gcc45 gcc46 gcc47 llvm clang {
+ depends_lib-append port:clang-3.1
+ configure.compiler clang
+ configure.cc ${prefix}/bin/clang-mp-3.1
+ configure.cxx ${prefix}/bin/clang++-mp-3.1
+}
+
variant gforker description {
Use gforker process manager instead of the default hydra
} {
@@ -169,16 +176,12 @@
configure.args-delete --with-pm=hydra
}
-platform darwin {
- configure.args-append --enable-sharedlibs=osx-gcc
+variant tuned description {Build with more optimizations)} {
+ configure.args-delete --enable-fast=O2
+ configure.args-append --enable-fast=all \
+ MPICH2LIB_CFLAGS='-fomit-frame-pointer -O2'
}
-variant default_mpi description {
- Install as defalt MPI -- conflict with OpenMPI
-} {
- configure.args-delete --includedir=${prefix}/include/${name}
- conflicts-append openmpi
-}
-
livecheck.type regex
-livecheck.regex ${name}-(\[0-9.p\]+)${extract.suffix}
+livecheck.regex ${pkgname}-(\[0-9.pbrc\]+)${extract.suffix}
+livecheck.url ${homepage}downloads/index.php?s=downloads
Modified: trunk/dports/science/mpich2-devel/Portfile
===================================================================
--- trunk/dports/science/mpich2-devel/Portfile 2012-10-09 11:12:30 UTC (rev 98583)
+++ trunk/dports/science/mpich2-devel/Portfile 2012-10-09 12:58:01 UTC (rev 98584)
@@ -5,8 +5,9 @@
name mpich2-devel
set pkgname mpich2
-version 1.5rc3
+version 1.5
revision 0
+epoch 20121008
license BSD
categories science parallel net
platforms darwin
@@ -28,8 +29,8 @@
distname ${pkgname}-${version}
checksums \
- rmd160 7a21996f3b8ab0dfa9f72335f53a4b3c120f0b84 \
- sha256 31beae6f6344f600ed43ad8bbcca21a04fbbfc225608e7c51e7ab2e83fd9e9fc
+ rmd160 69572f5c435aec1ef37af197f7509cfc073ce53a \
+ sha256 7175926fc2e4230f00201e880318c08de4f949c0dbe167fe1b2e256ac79d5f66
depends_lib-append port:libxml2
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121009/38846b50/attachment.html>
More information about the macports-changes
mailing list