[117887] trunk/dports/lang/ocaml

mww at macports.org mww at macports.org
Sun Mar 16 02:07:40 PDT 2014


Revision: 117887
          https://trac.macports.org/changeset/117887
Author:   mww at macports.org
Date:     2014-03-16 02:07:40 -0700 (Sun, 16 Mar 2014)
Log Message:
-----------
ocaml: remove '-no-defer-pop' from CFLAGS -- fails for clang and is only for some gcc versions anyway it seems (#42864)

Modified Paths:
--------------
    trunk/dports/lang/ocaml/Portfile

Added Paths:
-----------
    trunk/dports/lang/ocaml/files/
    trunk/dports/lang/ocaml/files/patch-configure.diff

Modified: trunk/dports/lang/ocaml/Portfile
===================================================================
--- trunk/dports/lang/ocaml/Portfile	2014-03-16 08:32:57 UTC (rev 117886)
+++ trunk/dports/lang/ocaml/Portfile	2014-03-16 09:07:40 UTC (rev 117887)
@@ -5,7 +5,7 @@
 name                ocaml
 epoch               1
 version             4.01.0
-revision            0
+revision            1
 # 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
@@ -33,6 +33,11 @@
 
 set docdir          ${prefix}/share/doc/${name}
 
+if {[string match "*clang*" ${configure.compiler}]} {
+  # remove '-no-defer-pop' for clang -- it "circumvents a bug in certain versions of gcc" only anyway
+  patchfiles-append patch-configure.diff
+}
+
 # Configure.
 configure.pre_args  -prefix ${prefix}
 configure.args      -no-tk -cc ${configure.cc} -aspp \"${configure.cc} -c\" \

Added: trunk/dports/lang/ocaml/files/patch-configure.diff
===================================================================
--- trunk/dports/lang/ocaml/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/lang/ocaml/files/patch-configure.diff	2014-03-16 09:07:40 UTC (rev 117887)
@@ -0,0 +1,11 @@
+--- configure	2013-08-23 08:22:36.000000000 +0200
++++ configure	2014-03-16 10:02:34.000000000 +0100
+@@ -278,7 +278,7 @@
+     bytecccompopts="-fno-defer-pop $gcc_warnings -DSHRINKED_GNUC"
+     mathlib="";;
+   *,*-*-darwin*)
+-    bytecccompopts="-fno-defer-pop $gcc_warnings"
++    bytecccompopts="$gcc_warnings"
+     mathlib=""
+     mkexe="$mkexe -Wl,-no_compact_unwind"
+     # Tell gcc that we can use 32-bit code addresses for threaded code
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140316/c992b359/attachment.html>


More information about the macports-changes mailing list