[35885] trunk/dports/science/hdf5/Portfile

[mcalhoun at macports.org]

Revision: 35885
          http://trac.macosforge.org/projects/macports/changeset/35885
Author:   mcalhoun at macports.org
Date:     2008-04-09 04:08:22 -0700 (Wed, 09 Apr 2008)

Log Message:
-----------
hdf5:
Separate gcc43 variant into Fortran variants, which add Fortran interface,
and optimized variant, which adds optimization flags.
Just as the gcc43 varian was broken, the optimized variant is also broken.

Modified Paths:
--------------
    trunk/dports/science/hdf5/Portfile

Modified: trunk/dports/science/hdf5/Portfile
===================================================================
--- trunk/dports/science/hdf5/Portfile	2008-04-09 11:05:41 UTC (rev 35884)
+++ trunk/dports/science/hdf5/Portfile	2008-04-09 11:08:22 UTC (rev 35885)
@@ -5,6 +5,7 @@
 
 name                hdf5
 version             1.6.7
+revision            1
 categories          science
 maintainers         nomaintainer
 
@@ -18,25 +19,52 @@
                     rmd160 2dbbcccd32986dcd66ce804c5e90ac6c949b71f6
 
 depends_lib         port:zlib
-patchfiles	        patch-commence.diff patch-c-commence.diff
+patchfiles          patch-commence.diff patch-c-commence.diff \
+                    patch-fortran-commence.diff patch-H5f90i.diff
 
 use_parallel_build  yes
 configure.args      --enable-cxx --with-zlib=yes --with-szlib=no
-configure.ldflags   "-L${worksrcpath}/src/.libs -L${prefix}/lib"
+configure.ldflags   -L${worksrcpath}/src/.libs -L${prefix}/lib
 destroot.destdir    prefix=${destroot}${prefix}
 test.run            yes
 test.target         check
 
-variant szip description "Enable szip compression support" {
+variant szip description {Enable szip compression support} {
     configure.args-delete	--with-szlib=no
 	configure.args-append	--with-szlib=yes
 	depends_lib-append	    port:szip
 }
 
-variant gcc43 description "Use GCC 4.3 for compilation of HDF-5 - optimized for host machine (+ Fotran support)" {
+variant optimized description {Use GCC 4.3 for compilation of HDF-5 - optimized for host machine} {
     depends_build-append        port:gcc43
-    configure.args-append       --enable-fortran
     configure.compiler          macports-gcc-4.3
-    configure.cflags-append     "-ftree-vectorize -march=native -O3"
-    configure.cxxflags-append   "-ftree-vectorize -march=native -O3"
+    configure.cflags-delete     -O2
+    configure.cxxflags-delete   -O2
+    configure.cflags-append     -ftree-vectorize -march=native -O3
+    configure.cxxflags-append   -ftree-vectorize -march=native -O3
+    if { [variant_isset gcc43] } {
+        configure.fflags-delete     -O2
+        configure.fflags-append     -ftree-vectorize -march=native -O3
+    } else {
+        configure.fflags-delete     -O2
+        configure.fflags-append     -ftree-vectorize -O3
+    }
 }
+
+variant g95 description {compile the Fortran interface using G95} conflicts gcc42 gcc43 {
+    depends_build-append        port:g95
+    configure.args-append       --enable-fortran
+    configure.fc                ${prefix}/bin/g95
+}
+
+variant gcc42 description {compile the Fortran interface using GCC 4.2} conflicts g95 gcc43 {
+    depends_build-append        port:gcc42
+    configure.args-append       --enable-fortran
+    configure.fc                ${prefix}/bin/gfortran-mp-4.2
+}
+
+variant gcc43 description {compile the Fortran interface using GCC 4.3} conflicts g95 gcc42 {
+    depends_build-append        port:gcc43
+    configure.args-append       --enable-fortran
+    configure.fc                ${prefix}/bin/gfortran-mp-4.3
+}

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080409/e0202b97/attachment.html