The following commit has been merged in the master branch: commit cb4f3cfd343757cd098e0224d0ec844c8262e810 Author: Mehdi Dogguy <me...@debian.org> Date: Sun Apr 17 12:50:01 2011 +0200
Add patch to fix ocamlopt w.r.t. binutils 2.21 (Closes: #618106). diff --git a/debian/changelog b/debian/changelog index c5ea700..a30a950 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,10 @@ jocaml (3.12.0-1) UNRELEASED; urgency=low * New upstream release (Closes: #580103). * Fix typo in description (Closes: #582533). + * Add patch to fix ocamlopt w.r.t. binutils 2.21 (Closes: #618106). + - 0003-Fix-ocamlopt-w.r.t.-binutils-2.21.patch - -- Mehdi Dogguy <me...@debian.org> Sun, 17 Apr 2011 12:19:18 +0200 + -- Mehdi Dogguy <me...@debian.org> Sun, 17 Apr 2011 12:20:25 +0200 jocaml (3.11.2.a-1) unstable; urgency=low diff --git a/debian/patches/0003-Fix-ocamlopt-w.r.t.-binutils-2.21.patch b/debian/patches/0003-Fix-ocamlopt-w.r.t.-binutils-2.21.patch new file mode 100644 index 0000000..76d382b --- /dev/null +++ b/debian/patches/0003-Fix-ocamlopt-w.r.t.-binutils-2.21.patch @@ -0,0 +1,66 @@ +From: Stephane Glondu <st...@glondu.net> +Date: Tue, 8 Mar 2011 21:17:40 +0100 +Subject: Fix ocamlopt w.r.t. binutils 2.21 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Bug: http://caml.inria.fr/mantis/view.php?id=5237 +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=617404 +Authors: Eric Cooper, spiralvoice +Reviewed-by: Stéphane Glondu <st...@glondu.net> +--- + asmcomp/amd64/emit.mlp | 13 +++++++------ + asmcomp/i386/emit.mlp | 6 +++--- + 2 files changed, 10 insertions(+), 9 deletions(-) + +diff --git a/asmcomp/amd64/emit.mlp b/asmcomp/amd64/emit.mlp +index 55da47b..45afbb7 100644 +--- a/asmcomp/amd64/emit.mlp ++++ b/asmcomp/amd64/emit.mlp +@@ -688,17 +688,18 @@ let fundecl fundecl = + emit_all true fundecl.fun_body; + List.iter emit_call_gc !call_gc_sites; + emit_call_bound_errors (); ++ begin match Config.system with ++ "linux" | "gnu" -> ++ ` .type {emit_symbol fundecl.fun_name},@function\n`; ++ ` .size {emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n` ++ | _ -> () ++ end; + if !float_constants <> [] then begin + if macosx + then ` .literal8\n` + else ` .section .rodata.cst8,\"a\",@progbits\n`; + List.iter emit_float_constant !float_constants +- end; +- match Config.system with +- "linux" | "gnu" -> +- ` .type {emit_symbol fundecl.fun_name},@function\n`; +- ` .size {emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n` +- | _ -> () ++ end + + (* Emission of data *) + +diff --git a/asmcomp/i386/emit.mlp b/asmcomp/i386/emit.mlp +index 3baba2e..b29f365 100644 +--- a/asmcomp/i386/emit.mlp ++++ b/asmcomp/i386/emit.mlp +@@ -905,12 +905,12 @@ let fundecl fundecl = + emit_all true fundecl.fun_body; + List.iter emit_call_gc !call_gc_sites; + emit_call_bound_errors (); +- List.iter emit_float_constant !float_constants; +- match Config.system with ++ begin match Config.system with + "linux_elf" | "bsd_elf" | "gnu" -> + ` .type {emit_symbol fundecl.fun_name},@function\n`; + ` .size {emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n` +- | _ -> () ++ | _ -> () end; ++ List.iter emit_float_constant !float_constants + + + (* Emission of data *) +-- diff --git a/debian/patches/series b/debian/patches/series index 3937513..25dfcc0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 0001-Replace-Otyp_proc-with-Otyp_stuff-to-make-outcometre.patch 0002-Add-option-v-to-expunge-to-select-modules-to-filter-.patch +0003-Fix-ocamlopt-w.r.t.-binutils-2.21.patch -- jocaml packaging _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits