[76521] trunk/dports/science/hdf5-18

[mmoll at macports.org]

Revision: 76521
          http://trac.macports.org/changeset/76521
Author:   mmoll at macports.org
Date:     2011-02-26 21:00:18 -0800 (Sat, 26 Feb 2011)
Log Message:
-----------
enable shared libs  in fortran variants. Closes #28554.

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

Added Paths:
-----------
    trunk/dports/science/hdf5-18/files/patch-config-apple.diff
    trunk/dports/science/hdf5-18/files/patch-configure.diff

Removed Paths:
-------------
    trunk/dports/science/hdf5-18/files/apple_fortran_config.patch

Modified: trunk/dports/science/hdf5-18/Portfile
===================================================================
--- trunk/dports/science/hdf5-18/Portfile	2011-02-27 04:31:17 UTC (rev 76520)
+++ trunk/dports/science/hdf5-18/Portfile	2011-02-27 05:00:18 UTC (rev 76521)
@@ -7,7 +7,7 @@
 set realname        hdf5
 name                ${realname}-18
 version             1.8.6
-revision            1
+revision            2
 categories          science
 maintainers         mmoll openmaintainer
 
@@ -24,7 +24,8 @@
                     rmd160  e0feec256e61e4947367a2144d9835f569035577
 distname            ${realname}-${version}
 use_bzip2           yes
-patchfiles          apple_fortran_config.patch
+patchfiles          patch-config-apple.diff \
+                    patch-configure.diff
 depends_lib         port:zlib port:szip
 use_parallel_build  yes
 
@@ -67,7 +68,7 @@
 variant gcc44 description {Enable Fortran bindings (gfortran 4.4)} conflicts universal openmpi gcc45 {
     depends_lib-append          port:gcc44 
     configure.fc                ${prefix}/bin/gfortran-mp-4.4 
-    configure.args-delete       --disable-fortran --enable-shared 
+    configure.args-delete       --disable-fortran
     configure.args-append       --enable-fortran 
     configure.post_args LDFLAGS="-L${prefix}/lib"
 }
@@ -75,7 +76,7 @@
 variant gcc45 description {Enable Fortran bindings (gfortran 4.5)} conflicts universal openmpi gcc44 {
     depends_lib-append          port:gcc45 
     configure.fc                ${prefix}/bin/gfortran-mp-4.5 
-    configure.args-delete       --disable-fortran --enable-shared 
+    configure.args-delete       --disable-fortran
     configure.args-append       --enable-fortran 
     configure.post_args LDFLAGS="-L${prefix}/lib"
 }

Deleted: trunk/dports/science/hdf5-18/files/apple_fortran_config.patch
===================================================================
--- trunk/dports/science/hdf5-18/files/apple_fortran_config.patch	2011-02-27 04:31:17 UTC (rev 76520)
+++ trunk/dports/science/hdf5-18/files/apple_fortran_config.patch	2011-02-27 05:00:18 UTC (rev 76521)
@@ -1,11 +0,0 @@
---- config/apple	2011-02-01 17:36:41.000000000 +0100
-+++ config/apple.new	2011-02-01 17:36:15.000000000 +0100
-@@ -49,7 +49,7 @@
- 
- # Fortran doesn't work with shared libraries
- # 
--if test "X-" != "X-$enable_fortran"; then
-+if test "X-yes" = "X-$enable_fortran"; then
-         echo '    Warning: shared libraries are not supported with Fortran'
-         echo '    Disabling shared libraries'
-         enable_shared="no"

Added: trunk/dports/science/hdf5-18/files/patch-config-apple.diff
===================================================================
--- trunk/dports/science/hdf5-18/files/patch-config-apple.diff	                        (rev 0)
+++ trunk/dports/science/hdf5-18/files/patch-config-apple.diff	2011-02-27 05:00:18 UTC (rev 76521)
@@ -0,0 +1,19 @@
+--- config/apple.orig	2011-02-14 10:23:41.000000000 -0600
++++ config/apple	2011-02-26 15:11:09.000000000 -0600
+@@ -49,11 +49,11 @@
+ 
+ # Fortran doesn't work with shared libraries
+ # 
+-if test "X-" != "X-$enable_fortran"; then
+-        echo '    Warning: shared libraries are not supported with Fortran'
+-        echo '    Disabling shared libraries'
+-        enable_shared="no"
+-fi
++#if test "X-yes" = "X-$enable_fortran"; then
++#        echo '    Warning: shared libraries are not supported with Fortran'
++#        echo '    Disabling shared libraries'
++#        enable_shared="no"
++#fi
+ 
+ # compiler version strings
+ case $CC in

Added: trunk/dports/science/hdf5-18/files/patch-configure.diff
===================================================================
--- trunk/dports/science/hdf5-18/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/science/hdf5-18/files/patch-configure.diff	2011-02-27 05:00:18 UTC (rev 76521)
@@ -0,0 +1,11 @@
+--- configure.orig	2011-02-14 10:24:28.000000000 -0600
++++ configure	2011-02-26 15:11:13.000000000 -0600
+@@ -7386,7 +7386,7 @@
+ fi
+ 
+ if test "X${HDF_FORTRAN}" = "Xyes"; then
+-  H5_FORTRAN_SHARED="yes"
++  H5_FORTRAN_SHARED="no"
+ 
+   if (${FC} -V 2>&1 | grep '^pgf90') > /dev/null; then
+     H5_FORTRAN_SHARED="no"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110226/75cd2380/attachment.html>