[Pkg-ocaml-maint-commits] [ocaml] 01/02: Avoid multiple declarations of caml_set_oo_id in generated .c files
Mehdi Dogguy
mehdi at moszumanska.debian.org
Sun Oct 18 23:15:32 UTC 2015
This is an automated email from the git hooks/post-receive script.
mehdi pushed a commit to branch master
in repository ocaml.
commit 2abb2bfa6f901563e267470ff033da913c193f36
Author: Mehdi Dogguy <mehdi at debian.org>
Date: Mon Oct 19 01:01:10 2015 +0200
Avoid multiple declarations of caml_set_oo_id in generated .c files
---
debian/changelog | 7 +++++++
...oid-multiple-declarations-in-generated-.c-files-in.patch | 13 +++++++------
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 29a1daf..b99aac8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ocaml (4.02.3-4) UNRELEASED; urgency=medium
+
+ * Avoid multiple declarations of caml_set_oo_id in generated .c files
+ - Update 0005-Avoid-multiple-declarations-in-generated-.c-files-in.patch
+
+ -- Mehdi Dogguy <mehdi at debian.org> Mon, 19 Oct 2015 00:57:23 +0200
+
ocaml (4.02.3-3) unstable; urgency=medium
* Upload to unstable
diff --git a/debian/patches/0005-Avoid-multiple-declarations-in-generated-.c-files-in.patch b/debian/patches/0005-Avoid-multiple-declarations-in-generated-.c-files-in.patch
index e3f2c1b..8583f5b 100644
--- a/debian/patches/0005-Avoid-multiple-declarations-in-generated-.c-files-in.patch
+++ b/debian/patches/0005-Avoid-multiple-declarations-in-generated-.c-files-in.patch
@@ -13,16 +13,16 @@ mlvalues.h), but this is a small and (not too) intrusive patch.
Bug: http://caml.inria.fr/mantis/view.php?id=5254
Signed-off-by: Stephane Glondu <steph at glondu.net>
---
- bytecomp/bytelink.ml | 17 +++++++++++++++--
+ bytecomp/bytelink.ml | 18 ++++++++++++++++--
bytecomp/symtable.ml | 8 +++++---
bytecomp/symtable.mli | 2 +-
- 3 files changed, 21 insertions(+), 6 deletions(-)
+ 3 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/bytecomp/bytelink.ml b/bytecomp/bytelink.ml
-index 2f5c0ec..7792b46 100644
+index 2f5c0ec..9c972a7 100644
--- a/bytecomp/bytelink.ml
+++ b/bytecomp/bytelink.ml
-@@ -439,6 +439,19 @@ let output_cds_file outfile =
+@@ -439,6 +439,20 @@ let output_cds_file outfile =
remove_file outfile;
raise x
@@ -37,12 +37,13 @@ index 2f5c0ec..7792b46 100644
+ "caml_Store_double_val";
+ "caml_Int64_val";
+ "caml_atom_table";
++ "caml_set_oo_id";
+]
+
(* Output a bytecode executable as a C file *)
let link_bytecode_as_c ppf tolink outfile =
-@@ -481,7 +494,7 @@ let link_bytecode_as_c ppf tolink outfile =
+@@ -481,7 +495,7 @@ let link_bytecode_as_c ppf tolink outfile =
(Marshal.to_string sections []);
output_string outchan "\n};\n\n";
(* The table of primitives *)
@@ -51,7 +52,7 @@ index 2f5c0ec..7792b46 100644
(* The entry point *)
output_string outchan "\
\nvoid caml_startup(char ** argv)\
-@@ -562,7 +575,7 @@ let link ppf objfiles output_name =
+@@ -562,7 +576,7 @@ let link ppf objfiles output_name =
#else\n\
typedef long value;\n\
#endif\n";
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml.git
More information about the Pkg-ocaml-maint-commits
mailing list