[94248] trunk/dports/lang/ocaml-devel

[mww at macports.org]

Revision: 94248
          https://trac.macports.org/changeset/94248
Author:   mww at macports.org
Date:     2012-06-13 00:43:53 -0700 (Wed, 13 Jun 2012)
Log Message:
-----------
ocaml-devel: integrate upstream patch

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

Added Paths:
-----------
    trunk/dports/lang/ocaml-devel/files/
    trunk/dports/lang/ocaml-devel/files/loc-line-numbers.diff

Modified: trunk/dports/lang/ocaml-devel/Portfile
===================================================================
--- trunk/dports/lang/ocaml-devel/Portfile	2012-06-13 07:05:08 UTC (rev 94247)
+++ trunk/dports/lang/ocaml-devel/Portfile	2012-06-13 07:43:53 UTC (rev 94248)
@@ -5,7 +5,7 @@
 name                ocaml-devel
 conflicts           ocaml
 version             4.00.0+beta2
-revision            1
+revision            2
 set major_vers      4.00
 platforms           darwin
 maintainers         mww openmaintainer
@@ -23,6 +23,9 @@
             the Caml Light dialect extended with a complete class-based object \
             system    and a powerful module system in the style of Standard ML.
 
+# http://caml.inria.fr/mantis/view.php?id=5643
+patchfiles          loc-line-numbers.diff
+
 use_bzip2           yes
 distname            ocaml-${version}
 
@@ -35,11 +38,7 @@
 
 # Configure.
 configure.pre_args  -prefix ${prefix}
-configure.args      -no-tk -cc ${configure.cc} -aspp \"${configure.cc} -c\"
-post-configure {
-    # http://caml.inria.fr/mantis/view.php?id=5643
-    reinplace "s|ASM_CFI_SUPPORTED=.*|ASM_CFI_SUPPORTED=false|g" ${worksrcpath}/config/Makefile
-}
+configure.args      -no-tk -cc ${configure.cc} -aspp \"${configure.cc} -c\" -as \"${configure.cc} -c\"
 
 # Building.
 build.target        world.opt

Added: trunk/dports/lang/ocaml-devel/files/loc-line-numbers.diff
===================================================================
--- trunk/dports/lang/ocaml-devel/files/loc-line-numbers.diff	                        (rev 0)
+++ trunk/dports/lang/ocaml-devel/files/loc-line-numbers.diff	2012-06-13 07:43:53 UTC (rev 94248)
@@ -0,0 +1,27 @@
+Index: configure
+===================================================================
+--- configure	(revision 12596)
++++ configure	(working copy)
+@@ -1561,6 +1561,9 @@
+ if sh ./tryassemble cfi.S; then
+   echo "#define ASM_CFI_SUPPORTED" >> m.h
+   asm_cfi_supported=true
++  echo "assembler supports CFI"
++else
++  echo "assembler does not support CFI"
+ fi
+ 
+ # Final twiddling of compiler options to work around known bugs
+Index: asmcomp/emitaux.ml
+===================================================================
+--- asmcomp/emitaux.ml	(revision 12596)
++++ asmcomp/emitaux.ml	(working copy)
+@@ -132,7 +132,7 @@
+    display .loc for every instruction. *)
+ let emit_debug_info dbg =
+   if !Clflags.debug && not (Debuginfo.is_none dbg) then (
+-    let line = dbg.Debuginfo.dinfo_line in
++    let line = max 1 dbg.Debuginfo.dinfo_line in (* clang wants line >= 1 *)
+     let file_name = dbg.Debuginfo.dinfo_file in
+     let file_num =
+       try List.assoc file_name !file_pos_nums
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120613/528ffbee/attachment.html>