[Pkg-ocaml-maint-commits] [ocaml-batteries] 01/04: Fix compilation with OCaml 4.01.0

Stéphane Glondu glondu at moszumanska.debian.org
Thu Nov 21 10:45:25 UTC 2013


This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository ocaml-batteries.

commit cd6333bcb1664d7e59a29598b716bfe195dc9f55
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Nov 16 11:11:30 2013 +0100

    Fix compilation with OCaml 4.01.0
---
 .../0004-Fix-compilation-with-OCaml-4.01.0.patch   |   25 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 2 files changed, 26 insertions(+)

diff --git a/debian/patches/0004-Fix-compilation-with-OCaml-4.01.0.patch b/debian/patches/0004-Fix-compilation-with-OCaml-4.01.0.patch
new file mode 100644
index 0000000..81fbac1
--- /dev/null
+++ b/debian/patches/0004-Fix-compilation-with-OCaml-4.01.0.patch
@@ -0,0 +1,25 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Sat, 16 Nov 2013 11:09:41 +0100
+Subject: Fix compilation with OCaml 4.01.0
+
+Origin: https://raw.github.com/ocaml/opam-repository/master/packages/batteries.2.1.0/files/cloexec.patch
+---
+ src/batUnix.mliv | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/batUnix.mliv b/src/batUnix.mliv
+index bd710a7..d994e61 100644
+--- a/src/batUnix.mliv
++++ b/src/batUnix.mliv
+@@ -261,6 +261,10 @@ type open_flag = Unix.open_flag =
+                                     O_SYNC/O_DSYNC) *)
+ ##V4##  | O_SHARE_DELETE              (** OCaml 4 and Windows only: allow the file to be deleted
+ ##V4##                                   while still open *)
++##V4.1##  | O_CLOEXEC                   (** Set the close-on-exec flag on the
++##V4.1##                                    descriptor returned by {!openfile}
++##V4.1##
++##V4.1##                                    Since OCaml 4.1 *)
+ (** The flags to {!Unix.openfile}. *)
+ 
+ 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 013263b..9bc96f6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Do-not-enforce-sanity-check-rules.patch
 0002-Do-not-call-git-in-clean-rule.patch
 0003-Disable-qtest-based-tests.patch
+0004-Fix-compilation-with-OCaml-4.01.0.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-batteries.git



More information about the Pkg-ocaml-maint-commits mailing list