jjames / rpms / ocaml-lwt

Forked from rpms/ocaml-lwt a year ago
Clone
Blob Blame History Raw
diff -ur lwt-2.5.0.old/myocamlbuild.ml lwt-2.5.0/myocamlbuild.ml
--- lwt-2.5.0.old/myocamlbuild.ml	2015-07-03 13:39:30.000000000 +0100
+++ lwt-2.5.0/myocamlbuild.ml	2017-08-08 19:13:04.789273169 +0100
@@ -538,7 +538,7 @@
                  | nm, [], intf_modules ->
                      ocaml_lib nm;
                      let cmis =
-                       List.map (fun m -> (String.uncapitalize m) ^ ".cmi")
+                       List.map (fun m -> (String.uncapitalize_ascii m) ^ ".cmi")
                                 intf_modules in
                      dep ["ocaml"; "link"; "library"; "file:"^nm^".cma"] cmis
                  | nm, dir :: tl, intf_modules ->
@@ -551,7 +551,7 @@
                             ["compile"; "infer_interface"; "doc"])
                        tl;
                      let cmis =
-                       List.map (fun m -> dir^"/"^(String.uncapitalize m)^".cmi")
+                       List.map (fun m -> dir^"/"^(String.uncapitalize_ascii m)^".cmi")
                                 intf_modules in
                      dep ["ocaml"; "link"; "library"; "file:"^dir^"/"^nm^".cma"]
                          cmis)
diff -ur lwt-2.5.0.old/src/unix/lwt_unix.ml lwt-2.5.0/src/unix/lwt_unix.ml
--- lwt-2.5.0.old/src/unix/lwt_unix.ml	2015-07-03 13:39:30.000000000 +0100
+++ lwt-2.5.0/src/unix/lwt_unix.ml	2017-08-08 19:14:31.957333383 +0100
@@ -588,6 +588,7 @@
   | O_RSYNC
   | O_SHARE_DELETE
   | O_CLOEXEC
+  | O_KEEPEXEC
 
 external open_job : string -> Unix.open_flag list -> int -> (Unix.file_descr * bool) job = "lwt_unix_open_job"
 
@@ -1326,7 +1327,7 @@
   check_descriptor ch;
   Unix.shutdown ch.fd shutdown_command
 
-external stub_socketpair : socket_domain -> socket_type -> int -> Unix.file_descr * Unix.file_descr = "lwt_unix_socketpair_stub"
+external stub_socketpair : ?cloexec:bool -> socket_domain -> socket_type -> int -> Unix.file_descr * Unix.file_descr = "lwt_unix_socketpair_stub"
 
 let socketpair dom typ proto =
   let do_socketpair = if Sys.win32 then stub_socketpair else Unix.socketpair  in
Only in lwt-2.5.0/src/unix: lwt_unix.ml~
diff -ur lwt-2.5.0.old/src/unix/lwt_unix.mli lwt-2.5.0/src/unix/lwt_unix.mli
--- lwt-2.5.0.old/src/unix/lwt_unix.mli	2015-07-03 13:39:30.000000000 +0100
+++ lwt-2.5.0/src/unix/lwt_unix.mli	2017-08-08 19:13:04.790273170 +0100
@@ -314,6 +314,7 @@
   | O_RSYNC
   | O_SHARE_DELETE
   | O_CLOEXEC
+  | O_KEEPEXEC
 
 val openfile : string -> open_flag list -> file_perm -> file_descr Lwt.t
   (** Wrapper for [Unix.openfile]. *)
diff -ur lwt-2.5.0.old/src/unix/lwt_unix_stubs.c lwt-2.5.0/src/unix/lwt_unix_stubs.c
--- lwt-2.5.0.old/src/unix/lwt_unix_stubs.c	2015-07-03 13:39:30.000000000 +0100
+++ lwt-2.5.0/src/unix/lwt_unix_stubs.c	2017-08-08 19:15:07.469357918 +0100
@@ -453,9 +453,9 @@
   SOCK_STREAM, SOCK_DGRAM, SOCK_RAW, SOCK_SEQPACKET
 };
 
-CAMLprim value lwt_unix_socketpair_stub(value domain, value type, value protocol)
+CAMLprim value lwt_unix_socketpair_stub(value cloexec, value domain, value type, value protocol)
 {
-  CAMLparam3(domain, type, protocol);
+  CAMLparam4(cloexec, domain, type, protocol);
   CAMLlocal1(result);
   SOCKET sockets[2];
   lwt_unix_socketpair(socket_domain_table[Int_val(domain)],
Only in lwt-2.5.0/src/unix: lwt_unix_stubs.c~