Revision
75546
Author
jmr@macports.org
Date
2011-01-29 09:52:39 -0800 (Sat, 29 Jan 2011)

Log Message

hdf5: enable shared libs and add mpich2 variant (#22467), fix +fortran configure failure on x86_64, simplify setting of optflags

Modified Paths

Diff

Modified: trunk/dports/science/hdf5/Portfile (75545 => 75546)


--- trunk/dports/science/hdf5/Portfile	2011-01-29 17:27:48 UTC (rev 75545)
+++ trunk/dports/science/hdf5/Portfile	2011-01-29 17:52:39 UTC (rev 75546)
@@ -5,7 +5,7 @@
 
 name                hdf5
 version             1.6.9
-revision            0
+revision            1
 categories          science
 maintainers         nomaintainer
 
@@ -32,9 +32,13 @@
 use_parallel_build  yes
 configure.ccache    no
 
-configure.args      --enable-cxx --with-zlib=yes --with-szlib=no
+configure.args      --enable-cxx --with-zlib=yes --with-szlib=no --enable-shared
 configure.ldflags   -L${worksrcpath}/src/.libs -L${prefix}/lib
 
+if {${os.platform} == "darwin" && [string match *64 $build_arch]} {
+    configure.args-append --build=${build_arch}-apple-${os.platform}${os.version}
+}
+
 destroot.destdir    prefix=${destroot}${prefix}
 
 test.run            yes
@@ -89,15 +93,18 @@
 }
 
 variant optimized description {Higher compiler optimization for host machine (esp. for gcc43/gcc44)} {
-    configure.cflags-delete     -O2
-    configure.cxxflags-delete   -O2
-    configure.fflags-delete     -O2
-    configure.cflags-append     -ftree-vectorize -O3
-    configure.cxxflags-append   -ftree-vectorize -O3
-    configure.fflags-append     -ftree-vectorize -O3
+    configure.optflags-delete     -O2
+    configure.optflags-append     -ftree-vectorize -O3
     if { [variant_isset gcc43] || [variant_isset gcc44] } {
-        configure.cflags-append     -march=native
-        configure.cxxflags-append   -march=native
-        configure.fflags-append     -march=native
+        configure.optflags-append     -march=native
     }
 }
+
+variant mpich2 description {Parallel HDF5 with mpich2 (disables C++)} {
+    depends_lib-append          port:mpich2
+    configure.args-delete       --enable-cxx
+    configure.cc                ${prefix}/bin/mpicc
+    if { [variant_isset fortran] } {
+       configure.fc             ${prefix}/bin/mpif90
+    }
+}