[94986] trunk/dports/science/mcl

jmr at macports.org jmr at macports.org
Tue Jul 3 04:31:32 PDT 2012


Revision: 94986
          https://trac.macports.org/changeset/94986
Author:   jmr at macports.org
Date:     2012-07-03 04:31:31 -0700 (Tue, 03 Jul 2012)
Log Message:
-----------
mcl: fix building in C99 mode (#32476)

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

Added Paths:
-----------
    trunk/dports/science/mcl/files/
    trunk/dports/science/mcl/files/C99.patch

Modified: trunk/dports/science/mcl/Portfile
===================================================================
--- trunk/dports/science/mcl/Portfile	2012-07-03 11:05:30 UTC (rev 94985)
+++ trunk/dports/science/mcl/Portfile	2012-07-03 11:31:31 UTC (rev 94986)
@@ -17,4 +17,7 @@
 master_sites    http://micans.org/mcl/src/
 checksums       rmd160 f43c64da14ec4316a67d3a9987aecd1bef25298e \
                 sha256 11fd811a84e340faf1596ee5e1889457c87b4e172aa8b150bda3414f06f093c8
+
+patchfiles      C99.patch
+
 configure.args  --enable-blast --mandir=${prefix}/share/man

Added: trunk/dports/science/mcl/files/C99.patch
===================================================================
--- trunk/dports/science/mcl/files/C99.patch	                        (rev 0)
+++ trunk/dports/science/mcl/files/C99.patch	2012-07-03 11:31:31 UTC (rev 94986)
@@ -0,0 +1,55 @@
+--- src/impala/matrix.h.orig	2012-01-05 22:25:14.000000000 +1100
++++ src/impala/matrix.h	2012-07-03 21:24:32.000000000 +1000
+@@ -789,7 +789,7 @@ enum
+ mclv* mclgUnionv
+ (  mclx* mx                   /*  mx->dom_rows used as scratch area     */
+ ,  const mclv* dom_cols       /*  take union over these columns in mx   */
+-,  const mclv* restrict       /*  only consider row entries in restrict */
++,  const mclv* restrictrows       /*  only consider row entries in restrict */
+ ,  mcxenum SCRATCH_STATUS     /*  if SCRATCH_READY also left SCRATCH_READY */
+ ,  mclv* dst
+ )  ;
+@@ -810,7 +810,7 @@ mclv* mclgUnionv
+ mclv* mclgUnionv2             /*  This one has a const matrix argument, additional scratch */
+ (  const mclx* mx
+ ,  const mclv* dom_cols
+-,  const mclv* restrict
++,  const mclv* restrictrows
+ ,  mcxenum SCRATCH_STATUS
+ ,  mclv* dst
+ ,  mclv* scratch
+--- src/impala/matrix.c.orig	2012-01-07 02:26:46.000000000 +1100
++++ src/impala/matrix.c	2012-07-03 21:25:56.000000000 +1000
+@@ -1843,18 +1843,18 @@ dim mclxUnaryList
+ mclv* mclgUnionv
+ (  mclx* mx
+ ,  const mclv* coldom
+-,  const mclv* restrict
++,  const mclv* restrictrows
+ ,  mcxenum scratch_STATUS
+ ,  mclv* dst
+ )
+-   {  return mclgUnionv2(mx, coldom, restrict, scratch_STATUS, dst, mx->dom_rows)
++   {  return mclgUnionv2(mx, coldom, restrictrows, scratch_STATUS, dst, mx->dom_rows)
+ ;  }
+ 
+ 
+ mclv* mclgUnionv2
+ (  const mclx* mx
+ ,  const mclv* coldom
+-,  const mclv* restrict
++,  const mclv* restrictrows
+ ,  mcxenum scratch_STATUS
+ ,  mclv* dst
+ ,  mclv* scratch
+@@ -1899,8 +1899,8 @@ mclv* mclgUnionv2
+                )
+                continue               /* SNH if coldom is subset of mx->dom_cols */
+             ;  if
+-               (  restrict
+-               && 0 > (o_restrict = mclvGetIvpOffset(restrict, idx, o_restrict))
++               (  restrictrows
++               && 0 > (o_restrict = mclvGetIvpOffset(restrictrows, idx, o_restrict))
+                )
+                continue               /* not found in restriction domain */
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120703/359aa278/attachment.html>


More information about the macports-changes mailing list