[94285] trunk/dports/lang/ocaml-devel
mww at macports.org
mww at macports.org
Wed Jun 13 15:31:50 PDT 2012
Revision: 94285
https://trac.macports.org/changeset/94285
Author: mww at macports.org
Date: 2012-06-13 15:31:48 -0700 (Wed, 13 Jun 2012)
Log Message:
-----------
ocaml-devel: integrate upstream patches
Modified Paths:
--------------
trunk/dports/lang/ocaml-devel/Portfile
Added Paths:
-----------
trunk/dports/lang/ocaml-devel/files/configure-cfi-detect.diff
trunk/dports/lang/ocaml-devel/files/debuginfo-is-none.diff
Removed Paths:
-------------
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 21:54:33 UTC (rev 94284)
+++ trunk/dports/lang/ocaml-devel/Portfile 2012-06-13 22:31:48 UTC (rev 94285)
@@ -5,7 +5,7 @@
name ocaml-devel
conflicts ocaml
version 4.00.0+beta2
-revision 2
+revision 3
set major_vers 4.00
platforms darwin
maintainers mww openmaintainer
@@ -24,7 +24,7 @@
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
+patchfiles configure-cfi-detect.diff debuginfo-is-none.diff
use_bzip2 yes
distname ocaml-${version}
Added: trunk/dports/lang/ocaml-devel/files/configure-cfi-detect.diff
===================================================================
--- trunk/dports/lang/ocaml-devel/files/configure-cfi-detect.diff (rev 0)
+++ trunk/dports/lang/ocaml-devel/files/configure-cfi-detect.diff 2012-06-13 22:31:48 UTC (rev 94285)
@@ -0,0 +1,31 @@
+Index: configure
+===================================================================
+--- configure (revision 12596)
++++ configure (working copy)
+@@ -1556,7 +1556,7 @@
+
+ asm_cfi_supported=false
+
+-export aspp
++export as aspp
+
+ if sh ./tryassemble cfi.S; then
+ echo "#define ASM_CFI_SUPPORTED" >> m.h
+Index: config/auto-aux/tryassemble
+===================================================================
+--- config/auto-aux/tryassemble (revision 12596)
++++ config/auto-aux/tryassemble (working copy)
+@@ -5,3 +5,13 @@
+ else
+ $aspp -o tst $* 2> /dev/null || exit 100
+ fi
++
++# test as also (if differs)
++if test "$aspp" != "$as"; then
++if test "$verbose" = yes; then
++echo "tryassemble: $as -o tst $*" >&2
++$as -o tst $* || exit 100
++else
++$as -o tst $* 2> /dev/null || exit 100
++fi
++fi
Added: trunk/dports/lang/ocaml-devel/files/debuginfo-is-none.diff
===================================================================
--- trunk/dports/lang/ocaml-devel/files/debuginfo-is-none.diff (rev 0)
+++ trunk/dports/lang/ocaml-devel/files/debuginfo-is-none.diff 2012-06-13 22:31:48 UTC (rev 94285)
@@ -0,0 +1,87 @@
+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/debuginfo.ml
+===================================================================
+--- asmcomp/debuginfo.ml (revision 12596)
++++ asmcomp/debuginfo.ml (working copy)
+@@ -31,11 +31,12 @@
+ dinfo_char_end = 0
+ }
+
++(* cannot use physical compare cause Debuginfo values are marshalled *)
+ let is_none t =
+- t == none
++ t = none
+
+ let to_string d =
+- if d == none
++ if d = none
+ then ""
+ else Printf.sprintf "{%s:%d,%d-%d}"
+ d.dinfo_file d.dinfo_line d.dinfo_char_start d.dinfo_char_end
+Index: asmcomp/debuginfo.mli
+===================================================================
+--- asmcomp/debuginfo.mli (revision 12596)
++++ asmcomp/debuginfo.mli (working copy)
+@@ -12,7 +12,7 @@
+
+ type kind = Dinfo_call | Dinfo_raise
+
+-type t = {
++type t = private {
+ dinfo_kind: kind;
+ dinfo_file: string;
+ dinfo_line: int;
+Index: asmcomp/emitaux.ml
+===================================================================
+--- asmcomp/emitaux.ml (revision 12596)
++++ asmcomp/emitaux.ml (working copy)
+@@ -133,6 +133,7 @@
+ let emit_debug_info dbg =
+ if !Clflags.debug && not (Debuginfo.is_none dbg) then (
+ let line = dbg.Debuginfo.dinfo_line in
++ assert (line <> 0); (* clang errors out on zero line numbers *)
+ let file_name = dbg.Debuginfo.dinfo_file in
+ let file_num =
+ try List.assoc file_name !file_pos_nums
+@@ -182,13 +183,13 @@
+ lbl in
+ let emit_frame fd =
+ a.efa_label fd.fd_lbl;
+- a.efa_16 (if fd.fd_debuginfo == Debuginfo.none
++ a.efa_16 (if Debuginfo.is_none fd.fd_debuginfo
+ then fd.fd_frame_size
+ else fd.fd_frame_size + 1);
+ a.efa_16 (List.length fd.fd_live_offset);
+ List.iter a.efa_16 fd.fd_live_offset;
+ a.efa_align Arch.size_addr;
+- if fd.fd_debuginfo != Debuginfo.none then begin
++ if not (Debuginfo.is_none fd.fd_debuginfo) then begin
+ let d = fd.fd_debuginfo in
+ let line = min 0xFFFFF d.dinfo_line
+ and char_start = min 0xFF d.dinfo_char_start
+Index: asmcomp/printlinear.ml
+===================================================================
+--- asmcomp/printlinear.ml (revision 12596)
++++ asmcomp/printlinear.ml (working copy)
+@@ -65,7 +65,7 @@
+ | Lraise ->
+ fprintf ppf "raise %a" reg i.arg.(0)
+ end;
+- if i.dbg != Debuginfo.none then
++ if not (Debuginfo.is_none i.dbg) then
+ fprintf ppf " %s" (Debuginfo.to_string i.dbg)
+
+ let rec all_instr ppf i =
Deleted: trunk/dports/lang/ocaml-devel/files/loc-line-numbers.diff
===================================================================
--- trunk/dports/lang/ocaml-devel/files/loc-line-numbers.diff 2012-06-13 21:54:33 UTC (rev 94284)
+++ trunk/dports/lang/ocaml-devel/files/loc-line-numbers.diff 2012-06-13 22:31:48 UTC (rev 94285)
@@ -1,27 +0,0 @@
-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/15c941b0/attachment-0001.html>
More information about the macports-changes
mailing list