[111342] trunk/dports/science
eborisch at macports.org
eborisch at macports.org
Wed Sep 18 20:10:07 PDT 2013
Revision: 111342
https://trac.macports.org/changeset/111342
Author: eborisch at macports.org
Date: 2013-09-18 20:10:06 -0700 (Wed, 18 Sep 2013)
Log Message:
-----------
mpich[-devel] and subports: Retain headers for all flavors; configured in constants in mpichxx.h complain on compiler mis-matches. Fix missing clang34 select file. Make gcc flavors always provide fortran bindings (retain +fortran variant for compatibility.)
Modified Paths:
--------------
trunk/dports/science/mpich/Portfile
trunk/dports/science/mpich-devel/Portfile
Added Paths:
-----------
trunk/dports/science/mpich/files/mpich-clang34
trunk/dports/science/mpich/files/mpich-clang34-fortran
Removed Paths:
-------------
trunk/dports/science/mpich/files/mpich-gcc43
trunk/dports/science/mpich/files/mpich-gcc44
trunk/dports/science/mpich/files/mpich-gcc45
trunk/dports/science/mpich/files/mpich-gcc46
trunk/dports/science/mpich/files/mpich-gcc47
trunk/dports/science/mpich/files/mpich-gcc48
trunk/dports/science/mpich/files/mpich-gcc49
trunk/dports/science/mpich-devel/files/mpich-gcc43
trunk/dports/science/mpich-devel/files/mpich-gcc44
trunk/dports/science/mpich-devel/files/mpich-gcc45
trunk/dports/science/mpich-devel/files/mpich-gcc46
trunk/dports/science/mpich-devel/files/mpich-gcc47
trunk/dports/science/mpich-devel/files/mpich-gcc48
trunk/dports/science/mpich-devel/files/mpich-gcc49
Modified: trunk/dports/science/mpich/Portfile
===================================================================
--- trunk/dports/science/mpich/Portfile 2013-09-19 02:13:35 UTC (rev 111341)
+++ trunk/dports/science/mpich/Portfile 2013-09-19 03:10:06 UTC (rev 111342)
@@ -14,7 +14,7 @@
name mpich
version 3.0.4
-revision 5
+revision 6
license BSD
categories science parallel net
@@ -63,13 +63,16 @@
--enable-versioning \
"F90FLAGS='' F90=''"
+# As MPICH creates compiler wrappers, there are lots of
+# variants for what compiler the user would like to wrap.
+
subport ${name}-gcc43 {}
subport ${name}-gcc44 {}
subport ${name}-gcc45 {}
subport ${name}-gcc46 {}
subport ${name}-gcc47 {}
subport ${name}-gcc48 {}
-subport ${name}-gcc49 {}
+#subport ${name}-gcc49 {}
subport ${name}-clang {}
subport ${name}-clang31 {}
subport ${name}-clang32 {}
@@ -78,6 +81,24 @@
subport ${name}-llvm {}
subport ${name}-default {}
+# Compiler variant set
+# name depends_lib configure.compiler Description
+array set clist {
+ clang {clang}
+ clang31 {macports-clang-3.1}
+ clang32 {macports-clang-3.2}
+ clang33 {macports-clang-3.3}
+ clang34 {macports-clang-3.4}
+ gcc43 {macports-gcc-4.3}
+ gcc44 {macports-gcc-4.4}
+ gcc45 {macports-gcc-4.5}
+ gcc46 {macports-gcc-4.6}
+ gcc47 {macports-gcc-4.7}
+ gcc48 {macports-gcc-4.8}
+ gcc49 {macports-gcc-4.9}
+ llvm {llvm-gcc-4.2}
+}
+
master_sites ${homepage}static/tarballs/${version}/
conflicts-append mpich2 \
@@ -101,27 +122,6 @@
configure.cppflags-delete -I${prefix}/include
configure.ldflags-delete -L${prefix}/lib
-# As MPICH creates compiler wrappers, there are lots of
-# variants for what compiler the user would like to wrap.
-
-# Compiler variant set
-# name depends_lib configure.compiler Description
-array set clist {
- clang {clang}
- clang31 {macports-clang-3.1}
- clang32 {macports-clang-3.2}
- clang33 {macports-clang-3.3}
- clang34 {macports-clang-3.4}
- gcc43 {macports-gcc-4.3}
- gcc44 {macports-gcc-4.4}
- gcc45 {macports-gcc-4.5}
- gcc46 {macports-gcc-4.6}
- gcc47 {macports-gcc-4.7}
- gcc48 {macports-gcc-4.8}
- gcc49 {macports-gcc-4.9}
- llvm {llvm-gcc-4.2}
-}
-
if {${subport} != ${name}} {
set cname [lindex [split ${subport} -] end]
if {${cname} == "default"} {
@@ -146,13 +146,17 @@
--sysconfdir=${prefix}/etc/${name}-${cname} \
--program-suffix=-$cname
+ if {${subport} != "${name}-default"} {
+ configure.args-append \
+ --includedir=${prefix}/include/${name}-${cname}
+ }
+
post-destroot {
if {${subport} != "${name}-default"} {
-# This version doesn't supply headers/doc/manpages
+# This version doesn't supply doc/manpages
# they would conflict with -default
delete ${destroot}${prefix}/share/man
delete ${destroot}${prefix}/share/doc
- delete ${destroot}${prefix}/include
} else {
xinstall -d ${destroot}${prefix}/lib/pkgconfig
file copy \
@@ -163,11 +167,10 @@
}
if { [string first gcc $cname] == 0 } {
- variant fortran description {Enable fortran bindings} {
- configure.args-delete --disable-f77 --disable-fc
- configure.args-append --enable-f77 --enable-fc
- select.file ${filespath}/mpich-${cname}-fortran
- }
+ configure.args-delete --disable-f77 --disable-fc
+ configure.args-append --enable-f77 --enable-fc
+ select.file ${filespath}/mpich-${cname}-fortran
+ variant fortran description {Stub : fortran always enabled for gcc-based version} {}
default_variants-append +fortran
} else {
set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
Copied: trunk/dports/science/mpich/files/mpich-clang34 (from rev 111293, trunk/dports/science/mpich/files/mpich-clang33)
===================================================================
--- trunk/dports/science/mpich/files/mpich-clang34 (rev 0)
+++ trunk/dports/science/mpich/files/mpich-clang34 2013-09-19 03:10:06 UTC (rev 111342)
@@ -0,0 +1,11 @@
+bin/hydra_nameserver-clang34
+bin/hydra_persist-clang34
+bin/hydra_pmi_proxy-clang34
+bin/mpicc-clang34
+bin/mpichversion-clang34
+bin/mpicxx-clang34
+bin/mpiexec.hydra-clang34
+bin/mpiexec.hydra-clang34
+-
+-
+bin/parkill-clang34
Copied: trunk/dports/science/mpich/files/mpich-clang34-fortran (from rev 111293, trunk/dports/science/mpich/files/mpich-clang33-fortran)
===================================================================
--- trunk/dports/science/mpich/files/mpich-clang34-fortran (rev 0)
+++ trunk/dports/science/mpich/files/mpich-clang34-fortran 2013-09-19 03:10:06 UTC (rev 111342)
@@ -0,0 +1,11 @@
+bin/hydra_nameserver-clang34
+bin/hydra_persist-clang34
+bin/hydra_pmi_proxy-clang34
+bin/mpicc-clang34
+bin/mpichversion-clang34
+bin/mpicxx-clang34
+bin/mpiexec.hydra-clang34
+bin/mpiexec.hydra-clang34
+bin/mpif77-clang34
+bin/mpif90-clang34
+bin/parkill-clang34
Deleted: trunk/dports/science/mpich/files/mpich-gcc43
===================================================================
--- trunk/dports/science/mpich/files/mpich-gcc43 2013-09-19 02:13:35 UTC (rev 111341)
+++ trunk/dports/science/mpich/files/mpich-gcc43 2013-09-19 03:10:06 UTC (rev 111342)
@@ -1,11 +0,0 @@
-bin/hydra_nameserver-gcc43
-bin/hydra_persist-gcc43
-bin/hydra_pmi_proxy-gcc43
-bin/mpicc-gcc43
-bin/mpichversion-gcc43
-bin/mpicxx-gcc43
-bin/mpiexec.hydra-gcc43
-bin/mpiexec.hydra-gcc43
--
--
-bin/parkill-gcc43
Deleted: trunk/dports/science/mpich/files/mpich-gcc44
===================================================================
--- trunk/dports/science/mpich/files/mpich-gcc44 2013-09-19 02:13:35 UTC (rev 111341)
+++ trunk/dports/science/mpich/files/mpich-gcc44 2013-09-19 03:10:06 UTC (rev 111342)
@@ -1,11 +0,0 @@
-bin/hydra_nameserver-gcc44
-bin/hydra_persist-gcc44
-bin/hydra_pmi_proxy-gcc44
-bin/mpicc-gcc44
-bin/mpichversion-gcc44
-bin/mpicxx-gcc44
-bin/mpiexec.hydra-gcc44
-bin/mpiexec.hydra-gcc44
--
--
-bin/parkill-gcc44
Deleted: trunk/dports/science/mpich/files/mpich-gcc45
===================================================================
--- trunk/dports/science/mpich/files/mpich-gcc45 2013-09-19 02:13:35 UTC (rev 111341)
+++ trunk/dports/science/mpich/files/mpich-gcc45 2013-09-19 03:10:06 UTC (rev 111342)
@@ -1,11 +0,0 @@
-bin/hydra_nameserver-gcc45
-bin/hydra_persist-gcc45
-bin/hydra_pmi_proxy-gcc45
-bin/mpicc-gcc45
-bin/mpichversion-gcc45
-bin/mpicxx-gcc45
-bin/mpiexec.hydra-gcc45
-bin/mpiexec.hydra-gcc45
--
--
-bin/parkill-gcc45
Deleted: trunk/dports/science/mpich/files/mpich-gcc46
===================================================================
--- trunk/dports/science/mpich/files/mpich-gcc46 2013-09-19 02:13:35 UTC (rev 111341)
+++ trunk/dports/science/mpich/files/mpich-gcc46 2013-09-19 03:10:06 UTC (rev 111342)
@@ -1,11 +0,0 @@
-bin/hydra_nameserver-gcc46
-bin/hydra_persist-gcc46
-bin/hydra_pmi_proxy-gcc46
-bin/mpicc-gcc46
-bin/mpichversion-gcc46
-bin/mpicxx-gcc46
-bin/mpiexec.hydra-gcc46
-bin/mpiexec.hydra-gcc46
--
--
-bin/parkill-gcc46
Deleted: trunk/dports/science/mpich/files/mpich-gcc47
===================================================================
--- trunk/dports/science/mpich/files/mpich-gcc47 2013-09-19 02:13:35 UTC (rev 111341)
+++ trunk/dports/science/mpich/files/mpich-gcc47 2013-09-19 03:10:06 UTC (rev 111342)
@@ -1,11 +0,0 @@
-bin/hydra_nameserver-gcc47
-bin/hydra_persist-gcc47
-bin/hydra_pmi_proxy-gcc47
-bin/mpicc-gcc47
-bin/mpichversion-gcc47
-bin/mpicxx-gcc47
-bin/mpiexec.hydra-gcc47
-bin/mpiexec.hydra-gcc47
--
--
-bin/parkill-gcc47
Deleted: trunk/dports/science/mpich/files/mpich-gcc48
===================================================================
--- trunk/dports/science/mpich/files/mpich-gcc48 2013-09-19 02:13:35 UTC (rev 111341)
+++ trunk/dports/science/mpich/files/mpich-gcc48 2013-09-19 03:10:06 UTC (rev 111342)
@@ -1,11 +0,0 @@
-bin/hydra_nameserver-gcc48
-bin/hydra_persist-gcc48
-bin/hydra_pmi_proxy-gcc48
-bin/mpicc-gcc48
-bin/mpichversion-gcc48
-bin/mpicxx-gcc48
-bin/mpiexec.hydra-gcc48
-bin/mpiexec.hydra-gcc48
--
--
-bin/parkill-gcc48
Deleted: trunk/dports/science/mpich/files/mpich-gcc49
===================================================================
--- trunk/dports/science/mpich/files/mpich-gcc49 2013-09-19 02:13:35 UTC (rev 111341)
+++ trunk/dports/science/mpich/files/mpich-gcc49 2013-09-19 03:10:06 UTC (rev 111342)
@@ -1,11 +0,0 @@
-bin/hydra_nameserver-gcc49
-bin/hydra_persist-gcc49
-bin/hydra_pmi_proxy-gcc49
-bin/mpicc-gcc49
-bin/mpichversion-gcc49
-bin/mpicxx-gcc49
-bin/mpiexec.hydra-gcc49
-bin/mpiexec.hydra-gcc49
--
--
-bin/parkill-gcc49
Modified: trunk/dports/science/mpich-devel/Portfile
===================================================================
--- trunk/dports/science/mpich-devel/Portfile 2013-09-19 02:13:35 UTC (rev 111341)
+++ trunk/dports/science/mpich-devel/Portfile 2013-09-19 03:10:06 UTC (rev 111342)
@@ -64,14 +64,17 @@
--enable-versioning \
"F90FLAGS='' F90=''"
+# As MPICH creates compiler wrappers, there are lots of
+# variants for what compiler the user would like to wrap.
+
subport ${name}-gcc43 {}
subport ${name}-gcc44 {}
subport ${name}-gcc45 {}
subport ${name}-gcc46 {}
subport ${name}-gcc47 {}
subport ${name}-gcc48 {}
-subport ${name}-gcc49 {}
-subport ${name}-clang {}
+#subport ${name}-gcc49 {}
+#subport ${name}-clang {}
subport ${name}-clang31 {}
subport ${name}-clang32 {}
subport ${name}-clang33 {}
@@ -79,6 +82,24 @@
subport ${name}-llvm {}
subport ${name}-default {}
+# Compiler variant set
+# name depends_lib configure.compiler Description
+array set clist {
+ clang {clang}
+ clang31 {macports-clang-3.1}
+ clang32 {macports-clang-3.2}
+ clang33 {macports-clang-3.3}
+ clang34 {macports-clang-3.4}
+ gcc43 {macports-gcc-4.3}
+ gcc44 {macports-gcc-4.4}
+ gcc45 {macports-gcc-4.5}
+ gcc46 {macports-gcc-4.6}
+ gcc47 {macports-gcc-4.7}
+ gcc48 {macports-gcc-4.8}
+ gcc49 {macports-gcc-4.9}
+ llvm {llvm-gcc-4.2}
+}
+
master_sites ${homepage}static/tarballs/${version}/
conflicts-append mpich2 \
@@ -102,27 +123,6 @@
configure.cppflags-delete -I${prefix}/include
configure.ldflags-delete -L${prefix}/lib
-# As MPICH creates compiler wrappers, there are lots of
-# variants for what compiler the user would like to wrap.
-
-# Compiler variant set
-# name depends_lib configure.compiler Description
-array set clist {
- clang {clang}
- clang31 {macports-clang-3.1}
- clang32 {macports-clang-3.2}
- clang33 {macports-clang-3.3}
- clang34 {macports-clang-3.4}
- gcc43 {macports-gcc-4.3}
- gcc44 {macports-gcc-4.4}
- gcc45 {macports-gcc-4.5}
- gcc46 {macports-gcc-4.6}
- gcc47 {macports-gcc-4.7}
- gcc48 {macports-gcc-4.8}
- gcc49 {macports-gcc-4.9}
- llvm {llvm-gcc-4.2}
-}
-
if {${subport} != ${name}} {
set cname [lindex [split ${subport} -] end]
if {${cname} == "default"} {
@@ -147,13 +147,17 @@
--sysconfdir=${prefix}/etc/${name}-${cname} \
--program-suffix=-$cname
+ if {${subport} != "${name}-default"} {
+ configure.args-append \
+ --includedir=${prefix}/include/${name}-${cname}
+ }
+
post-destroot {
if {${subport} != "${name}-default"} {
-# This version doesn't supply headers/doc/manpages
+# This version doesn't supply doc/manpages
# they would conflict with -default
delete ${destroot}${prefix}/share/man
delete ${destroot}${prefix}/share/doc
- delete ${destroot}${prefix}/include
} else {
xinstall -d ${destroot}${prefix}/lib/pkgconfig
file copy \
@@ -164,11 +168,10 @@
}
if { [string first gcc $cname] == 0 } {
- variant fortran description {Enable fortran bindings} {
- configure.args-delete --disable-f77 --disable-fc
- configure.args-append --enable-f77 --enable-fc
- select.file ${filespath}/mpich-${cname}-fortran
- }
+ configure.args-delete --disable-f77 --disable-fc
+ configure.args-append --enable-f77 --enable-fc
+ select.file ${filespath}/mpich-${cname}-fortran
+ variant fortran description {Stub : fortran always enabled for gcc-based version} {}
default_variants-append +fortran
} else {
set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
Deleted: trunk/dports/science/mpich-devel/files/mpich-gcc43
===================================================================
--- trunk/dports/science/mpich-devel/files/mpich-gcc43 2013-09-19 02:13:35 UTC (rev 111341)
+++ trunk/dports/science/mpich-devel/files/mpich-gcc43 2013-09-19 03:10:06 UTC (rev 111342)
@@ -1,11 +0,0 @@
-bin/hydra_nameserver-gcc43
-bin/hydra_persist-gcc43
-bin/hydra_pmi_proxy-gcc43
-bin/mpicc-gcc43
-bin/mpichversion-gcc43
-bin/mpicxx-gcc43
-bin/mpiexec.hydra-gcc43
-bin/mpiexec.hydra-gcc43
--
--
-bin/parkill-gcc43
Deleted: trunk/dports/science/mpich-devel/files/mpich-gcc44
===================================================================
--- trunk/dports/science/mpich-devel/files/mpich-gcc44 2013-09-19 02:13:35 UTC (rev 111341)
+++ trunk/dports/science/mpich-devel/files/mpich-gcc44 2013-09-19 03:10:06 UTC (rev 111342)
@@ -1,11 +0,0 @@
-bin/hydra_nameserver-gcc44
-bin/hydra_persist-gcc44
-bin/hydra_pmi_proxy-gcc44
-bin/mpicc-gcc44
-bin/mpichversion-gcc44
-bin/mpicxx-gcc44
-bin/mpiexec.hydra-gcc44
-bin/mpiexec.hydra-gcc44
--
--
-bin/parkill-gcc44
Deleted: trunk/dports/science/mpich-devel/files/mpich-gcc45
===================================================================
--- trunk/dports/science/mpich-devel/files/mpich-gcc45 2013-09-19 02:13:35 UTC (rev 111341)
+++ trunk/dports/science/mpich-devel/files/mpich-gcc45 2013-09-19 03:10:06 UTC (rev 111342)
@@ -1,11 +0,0 @@
-bin/hydra_nameserver-gcc45
-bin/hydra_persist-gcc45
-bin/hydra_pmi_proxy-gcc45
-bin/mpicc-gcc45
-bin/mpichversion-gcc45
-bin/mpicxx-gcc45
-bin/mpiexec.hydra-gcc45
-bin/mpiexec.hydra-gcc45
--
--
-bin/parkill-gcc45
Deleted: trunk/dports/science/mpich-devel/files/mpich-gcc46
===================================================================
--- trunk/dports/science/mpich-devel/files/mpich-gcc46 2013-09-19 02:13:35 UTC (rev 111341)
+++ trunk/dports/science/mpich-devel/files/mpich-gcc46 2013-09-19 03:10:06 UTC (rev 111342)
@@ -1,11 +0,0 @@
-bin/hydra_nameserver-gcc46
-bin/hydra_persist-gcc46
-bin/hydra_pmi_proxy-gcc46
-bin/mpicc-gcc46
-bin/mpichversion-gcc46
-bin/mpicxx-gcc46
-bin/mpiexec.hydra-gcc46
-bin/mpiexec.hydra-gcc46
--
--
-bin/parkill-gcc46
Deleted: trunk/dports/science/mpich-devel/files/mpich-gcc47
===================================================================
--- trunk/dports/science/mpich-devel/files/mpich-gcc47 2013-09-19 02:13:35 UTC (rev 111341)
+++ trunk/dports/science/mpich-devel/files/mpich-gcc47 2013-09-19 03:10:06 UTC (rev 111342)
@@ -1,11 +0,0 @@
-bin/hydra_nameserver-gcc47
-bin/hydra_persist-gcc47
-bin/hydra_pmi_proxy-gcc47
-bin/mpicc-gcc47
-bin/mpichversion-gcc47
-bin/mpicxx-gcc47
-bin/mpiexec.hydra-gcc47
-bin/mpiexec.hydra-gcc47
--
--
-bin/parkill-gcc47
Deleted: trunk/dports/science/mpich-devel/files/mpich-gcc48
===================================================================
--- trunk/dports/science/mpich-devel/files/mpich-gcc48 2013-09-19 02:13:35 UTC (rev 111341)
+++ trunk/dports/science/mpich-devel/files/mpich-gcc48 2013-09-19 03:10:06 UTC (rev 111342)
@@ -1,11 +0,0 @@
-bin/hydra_nameserver-gcc48
-bin/hydra_persist-gcc48
-bin/hydra_pmi_proxy-gcc48
-bin/mpicc-gcc48
-bin/mpichversion-gcc48
-bin/mpicxx-gcc48
-bin/mpiexec.hydra-gcc48
-bin/mpiexec.hydra-gcc48
--
--
-bin/parkill-gcc48
Deleted: trunk/dports/science/mpich-devel/files/mpich-gcc49
===================================================================
--- trunk/dports/science/mpich-devel/files/mpich-gcc49 2013-09-19 02:13:35 UTC (rev 111341)
+++ trunk/dports/science/mpich-devel/files/mpich-gcc49 2013-09-19 03:10:06 UTC (rev 111342)
@@ -1,11 +0,0 @@
-bin/hydra_nameserver-gcc49
-bin/hydra_persist-gcc49
-bin/hydra_pmi_proxy-gcc49
-bin/mpicc-gcc49
-bin/mpichversion-gcc49
-bin/mpicxx-gcc49
-bin/mpiexec.hydra-gcc49
-bin/mpiexec.hydra-gcc49
--
--
-bin/parkill-gcc49
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130918/6b1e649c/attachment-0001.html>
More information about the macports-changes
mailing list