[150944] trunk/dports/math/gnudatalanguage

[takeshi at macports.org]

Revision: 150944
          https://trac.macports.org/changeset/150944
Author:   takeshi at macports.org
Date:     2016-08-02 18:11:10 -0700 (Tue, 02 Aug 2016)
Log Message:
-----------
gnudatalanguage: enable build with openmpi, closing #51902. delete obsolete variants

Modified Paths:
--------------
    trunk/dports/math/gnudatalanguage/Portfile

Added Paths:
-----------
    trunk/dports/math/gnudatalanguage/files/
    trunk/dports/math/gnudatalanguage/files/patch-src-mpi.cpp.diff

Modified: trunk/dports/math/gnudatalanguage/Portfile
===================================================================
--- trunk/dports/math/gnudatalanguage/Portfile	2016-08-02 22:54:14 UTC (rev 150943)
+++ trunk/dports/math/gnudatalanguage/Portfile	2016-08-03 01:11:10 UTC (rev 150944)
@@ -8,10 +8,11 @@
 
 name                        gnudatalanguage
 version                     0.9.6
+revision                    1
 epoch                       2
 
 compilers.choose            cc cxx
-mpi.setup                   -openmpi -openmpi_devel -dragonegg
+mpi.setup                   -dragonegg
 
 categories                  math science
 maintainers                 takeshi
@@ -58,6 +59,7 @@
                             port:gettext
 conflicts_build             antlr
 
+patchfiles              patch-src-mpi.cpp.diff
 post-patch {
    # Avoid using heimdal's broken fnmatch.h
    reinplace "s|<\\(fnmatch\.h\\)>|\"/usr/include/\\1\"|" ${worksrcpath}/src/file.cpp
@@ -140,8 +142,8 @@
     if {[mpi_variant_isset]} {
         configure.args-delete   -DMPICH=OFF
         configure.args-append   -DMPICH=ON
-        configure.args-append   -DMPI_COMPILER=${mpi.cc} \
-                                -DMPI_LIBRARY=MPI_LIBRARY-NOTFOUND
+        configure.args-append   -DMPI_CXX_COMPILER=${mpi.cxx} \
+                                -DMPI_C_COMPILER=${mpi.cc}
     }
 }
 
@@ -162,10 +164,6 @@
     configure.args-append   -DPYTHON=ON
 }
 
-# TODO: Remove after 2016-01-04.
-variant python25 requires python27 description {Legacy variant} {}
-variant python26 requires python27 description {Legacy variant} {}
-
 variant python27 description {build with support for calling Python (2.7) from GDL (using numpy)} {
     depends_lib-append      port:py27-numpy
     configure.args-append   -DPYTHONDIR=${frameworks_dir}/Python.framework/Versions/2.7 \
@@ -179,8 +177,6 @@
     configure.args-append   -D
 }
 
-variant openmp requires gcc44 description {Legacy compatibility variant} {}
-
 variant gshhs description {build with support for GSHHS} {
     distfiles-append        ${gshhssrc}:gshhs \
                             ${gshhsdata}:gshhs

Added: trunk/dports/math/gnudatalanguage/files/patch-src-mpi.cpp.diff
===================================================================
--- trunk/dports/math/gnudatalanguage/files/patch-src-mpi.cpp.diff	                        (rev 0)
+++ trunk/dports/math/gnudatalanguage/files/patch-src-mpi.cpp.diff	2016-08-03 01:11:10 UTC (rev 150944)
@@ -0,0 +1,11 @@
+--- src/mpi.cpp.orig	2009-10-19 05:58:53.000000000 +0900
++++ src/mpi.cpp	2016-08-03 09:43:53.000000000 +0900
+@@ -163,7 +163,7 @@
+     int nElem = p0->N_Elements();
+ 
+     // determine the reduction operation
+-    int mpi_op = 0;
++    MPI_Op mpi_op = 0;
+ 
+     static int opSumIx = e->KeywordIx("SUM");
+     if( e->KeywordSet( opSumIx)) mpi_op = MPI_SUM;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160802/4db8aa0c/attachment.html>