[149527] trunk/dports/science

24 Jun 2016

Revision: 149527
          https://trac.macports.org/changeset/149527
Author:   takeshi@macports.org
Date:     2016-06-23 17:39:38 -0700 (Thu, 23 Jun 2016)
Log Message:
-----------
hdf4, hdf5, hdf5-18: remove ccache in h4cc|h5cc, hdfeos: respect configure.compiler and configure.ccache, closing #51600

Modified Paths:
--------------
    trunk/dports/science/hdf4/Portfile
    trunk/dports/science/hdf4/files/patch-hdf-examples-Makefile.in.diff
    trunk/dports/science/hdf5/Portfile
    trunk/dports/science/hdf5-18/Portfile
    trunk/dports/science/hdfeos/Portfile

Modified: trunk/dports/science/hdf4/Portfile
===================================================================

--- trunk/dports/science/hdf4/Portfile	2016-06-23 22:53:31 UTC (rev 149526)
+++ trunk/dports/science/hdf4/Portfile	2016-06-24 00:39:38 UTC (rev 149527)
@@ -6,6 +6,7 @@
 
 name                hdf4
 version             4.2.11
+revision            1
 platforms           darwin
 categories          science
 license             NCSA
@@ -40,6 +41,8 @@
 post-configure {
 # remove -arch from h4cc to fix failure of h4cc -E with +universal
     reinplace -E {s|-arch [a-z0-9_]+||g} ${worksrcpath}/hdf/util/h4cc
+# remove ccache
+    reinplace {s|ccache ||} ${worksrcpath}/hdf/util/h4cc
 }
 
 test.run            yes

Modified: trunk/dports/science/hdf4/files/patch-hdf-examples-Makefile.in.diff
===================================================================
--- trunk/dports/science/hdf4/files/patch-hdf-examples-Makefile.in.diff	2016-06-23 22:53:31 UTC (rev 149526)
+++ trunk/dports/science/hdf4/files/patch-hdf-examples-Makefile.in.diff	2016-06-24 00:39:38 UTC (rev 149527)
@@ -1,6 +1,6 @@
---- hdf/examples/Makefile.in.orig	2014-02-10 11:31:25.000000000 +0900
-+++ hdf/examples/Makefile.in	2014-06-14 17:41:04.000000000 +0900
-@@ -289,8 +289,8 @@
+--- hdf/examples/Makefile.in.orig	2015-02-10 01:43:49.000000000 +0900
++++ hdf/examples/Makefile.in	2016-06-24 08:47:51.000000000 +0900
+@@ -530,8 +530,8 @@
  INSTALL_TOP_FILES = README
  
  # Where to install example files

Modified: trunk/dports/science/hdf5/Portfile
===================================================================
--- trunk/dports/science/hdf5/Portfile	2016-06-23 22:53:31 UTC (rev 149526)
+++ trunk/dports/science/hdf5/Portfile	2016-06-24 00:39:38 UTC (rev 149527)
@@ -9,7 +9,7 @@
 name                hdf5
 version             1.10.0
 set shortversion    [join [lrange [split ${version} .] 0 1] .]
-revision            0
+revision            1
 categories          science
 maintainers         mmoll openmaintainer
 
@@ -69,6 +69,7 @@
             ${dir}/c++/src/h5c++ \
             ${dir}/src/libhdf5.settings \
             ${dir}/fortran/src/h5fc
+        reinplace {s|ccache ||} ${dir}/tools/misc/h5cc
     }
 }
 

Modified: trunk/dports/science/hdf5-18/Portfile
===================================================================
--- trunk/dports/science/hdf5-18/Portfile	2016-06-23 22:53:31 UTC (rev 149526)
+++ trunk/dports/science/hdf5-18/Portfile	2016-06-24 00:39:38 UTC (rev 149527)
@@ -9,7 +9,7 @@
 set realname        hdf5
 name                hdf5-18
 version             1.8.16
-revision            4
+revision            5
 categories          science
 maintainers         takeshi mmoll openmaintainer
 
@@ -82,6 +82,7 @@
             ${dir}/c++/src/h5c++ \
             ${dir}/src/libhdf5.settings \
             ${dir}/fortran/src/h5fc
+        reinplace {s|ccache ||} ${dir}/tools/misc/h5cc
     }
 }
 

Modified: trunk/dports/science/hdfeos/Portfile
===================================================================
--- trunk/dports/science/hdfeos/Portfile	2016-06-23 22:53:31 UTC (rev 149526)
+++ trunk/dports/science/hdfeos/Portfile	2016-06-24 00:39:38 UTC (rev 149527)
@@ -6,6 +6,7 @@
 
 name                hdfeos
 version             2.19
+revision            1
 categories          science
 maintainers         takeshi
 license             public-domain
@@ -32,8 +33,6 @@
                     --without-szlib       \
                     --enable-shared       \
                     --disable-dependency-tracking
-configure.cc        ${prefix}/bin/h4cc
-configure.ccache    no
 
 post-destroot {
     eval xinstall -m 644 [glob ${worksrcpath}/include/*.h] \

    

takeshi＠macports.org

tags

participants (1)