[90474] trunk/dports/lang/ocaml

[mww at macports.org]

Revision: 90474
          http://trac.macports.org/changeset/90474
Author:   mww at macports.org
Date:     2012-03-06 09:47:35 -0800 (Tue, 06 Mar 2012)
Log Message:
-----------
ocaml: fix patch to not break on 10.6 for gcc 4.2

Modified Paths:
--------------
    trunk/dports/lang/ocaml/Portfile
    trunk/dports/lang/ocaml/files/patch-otherlibs-bigarray.diff

Modified: trunk/dports/lang/ocaml/Portfile
===================================================================
--- trunk/dports/lang/ocaml/Portfile	2012-03-06 17:42:15 UTC (rev 90473)
+++ trunk/dports/lang/ocaml/Portfile	2012-03-06 17:47:35 UTC (rev 90474)
@@ -4,7 +4,7 @@
 
 name                ocaml
 version             3.12.1
-revision            3
+revision            4
 # When updating ocaml, also update camlp5 to a compatible version (c.f. #26769, #20219, #18292)
 set major_vers      [join [lrange [split ${version} .] 0 1] .]
 platforms           darwin

Modified: trunk/dports/lang/ocaml/files/patch-otherlibs-bigarray.diff
===================================================================
--- trunk/dports/lang/ocaml/files/patch-otherlibs-bigarray.diff	2012-03-06 17:42:15 UTC (rev 90473)
+++ trunk/dports/lang/ocaml/files/patch-otherlibs-bigarray.diff	2012-03-06 17:47:35 UTC (rev 90474)
@@ -6,7 +6,7 @@
    intnat flags;  /* Kind of element array + memory layout + allocation status */
    struct caml_ba_proxy * proxy; /* The proxy for sub-arrays, or NULL */
 +  /* PR#5516: use C99's / gcc's flexible array types if possible */
-+#if (__STDC_VERSION__ >= 199901L) || defined(__GNUC__)
++#if (__STDC_VERSION__ >= 199901L)
 +  intnat dim[]  /*[num_dims]*/; /* Size in each dimension */
 +#else
    intnat dim[1] /*[num_dims]*/; /* Size in each dimension */
@@ -52,7 +52,7 @@
 -                          + (num_dims - 1) * sizeof(intnat),
 -                          size, CAML_BA_MAX_MEMORY);
 +  /* PR#5516: use C99's / gcc's flexible array types if possible */
-+#if (__STDC_VERSION__ >= 199901L) || defined(__GNUC__)
++#if (__STDC_VERSION__ >= 199901L)
 +  asize = sizeof(struct caml_ba_array) + num_dims * sizeof(intnat);
 +#else
 +  asize = sizeof(struct caml_ba_array) + (num_dims - 1) * sizeof(intnat);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120306/04aa1664/attachment.html>