[36497] trunk/dports/science/hdf5

[takeshi at macports.org]

Revision: 36497
          http://trac.macosforge.org/projects/macports/changeset/36497
Author:   takeshi at macports.org
Date:     2008-05-04 03:01:03 -0700 (Sun, 04 May 2008)

Log Message:
-----------
hdf5: enabled thread-safety option and fixed g95 variant on PPC

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

Added Paths:
-----------
    trunk/dports/science/hdf5/files/patch-powerpc-apple.diff

Modified: trunk/dports/science/hdf5/Portfile
===================================================================
--- trunk/dports/science/hdf5/Portfile	2008-05-04 09:39:02 UTC (rev 36496)
+++ trunk/dports/science/hdf5/Portfile	2008-05-04 10:01:03 UTC (rev 36497)
@@ -7,7 +7,7 @@
 # We should provide a hdf5-devel port for 1.8 at this time, I guess.
 name                hdf5
 version             1.6.7
-revision            3
+revision            4
 categories          science
 maintainers         openmaintainer jochen
 
@@ -27,7 +27,8 @@
                     patch-H5PropList.cpp.diff
 
 use_parallel_build  yes
-configure.args      --enable-cxx --with-zlib=yes --with-szlib=no
+configure.args      --enable-cxx --with-zlib=yes --with-szlib=no \
+                    --enable-threadsafe
 configure.ldflags   -L${worksrcpath}/src/.libs -L${prefix}/lib
 destroot.destdir    prefix=${destroot}${prefix}
 test.run            yes
@@ -56,9 +57,11 @@
 }
 
 variant g95 conflicts gcc42 gcc43 description {compile the Fortran interface using G95} {
+    patchfiles-append patch-powerpc-apple.diff
     depends_lib-append          port:g95
     configure.args-append       --enable-fortran
     configure.fc                ${prefix}/bin/g95
+    configure.fflags            -fno-second-underscore
 }
 
 variant gcc42 conflicts g95 gcc43 description {compile the Fortran interface using GCC 4.2} {

Added: trunk/dports/science/hdf5/files/patch-powerpc-apple.diff
===================================================================
--- trunk/dports/science/hdf5/files/patch-powerpc-apple.diff	                        (rev 0)
+++ trunk/dports/science/hdf5/files/patch-powerpc-apple.diff	2008-05-04 10:01:03 UTC (rev 36497)
@@ -0,0 +1,72 @@
+--- fortran/config/powerpc-apple.orig	2008-05-04 16:59:28.000000000 +0900
++++ fortran/config/powerpc-apple	2008-05-04 17:04:46.000000000 +0900
+@@ -30,12 +30,7 @@
+ 
+ 
+ # The default Fortran 90 compiler
+-if test "X-" = "X-$F9X"; then
+-    F9X=xlf
+-    F9X_BASENAME=xlf
+-  else
+-    F9X_BASENAME=f95
+-fi
++F9X_BASENAME=g95
+ 
+ #
+ # HDF5 integers
+@@ -54,43 +49,15 @@
+ SIZE_T='SELECTED_INT_KIND(R_INTEGER)'
+ OBJECT_NAMELEN_DEFAULT_F=-1
+ 
+-case $F9X_BASENAME in
+-    xlf) 
+-        F9XSUFFIXFLAG="-qsuffix=f=f90 -qfree=f90"
+-        FFLAGS="$FFLAGS -static -O ${F9XSUFFIXFLAG} -qmoddir=./ "
+-        FSEARCH_DIRS="-I./ -I../src"
+-        DEBUG_FFLAGS="-g"
+-        PROD_FFLAGS="-O"
+-        PROFILE_FFLAGS="-g -pg"
+-        f9x_flags_set=yes
+-        ;;
+-
+-    #
+-    # Assume Absoft compiler
+-    #
+-    f95)
+-        # Set required flag for compiling C stubs
+-        CFLAGS="$CFLAGS -DH5_ABSOFT"
+-
+-        F9XSUFFIXFLAG=""
+-#We enforce that external name will appear in upper case (this is a default for Absoft)
+-        FFLAGS="$FFLAGS -YEXT_NAMES=UCS"
+-        FSEARCH_DIRS=""
+-        DEBUG_FFLAGS="-g"
+-        PROD_FFLAGS="-O"
+-        PROFILE_FFLAGS="-g"
+-        f9x_flags_set=yes
+-        ;;
+-
+-esac
+-
+-# ----------------------------------------------------------------------
+-# Absoft compiler must be used with --disable-shared.
+-# 
+-if test "X$F9X_BASENAME" = "Xf95"; then
+-  if test "X$enable_shared" != "Xno"; then
+-    echo "error: --disable-shared must be used when building with Absoft Fortran compiler"
+-    exit 1
+-  fi
+-fi
+-    
++#
++# Assume g95
++#
++
++F9XSUFFIXFLAG=""
++FFLAGS="$FFLAGS "
++FSEARCH_DIRS="-I./ -I../src"
++DEBUG_FFLAGS="-g"
++PROD_FFLAGS="-O"
++PROFILE_FFLAGS="-g -pg"
++f9x_flags_set=yes
++

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