balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compilation with lwt.3.0.0

Browse Source
This commit is contained in:
Grégoire Henry 2017-05-07 11:56:30 +02:00
parent d2a2052a2e
commit 443cee2bb3
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/install_build_deps.sh
View File

@ -51,6 +51,7 @@ if "$pin"; then
opam pin --yes add --no-action --dev-repo ocplib-json-typed opam pin --yes add --no-action --dev-repo ocplib-json-typed
opam pin --yes add --no-action --dev-repo ocplib-resto opam pin --yes add --no-action --dev-repo ocplib-resto
opam pin --yes add --no-action --dev-repo cohttp opam pin --yes add --no-action --dev-repo cohttp
opam pin --yes add --no-action ocp-build 1.99.18-beta ## TMP fix
opam pin add typerex-build --dev --no-action opam pin add typerex-build --dev --no-action
## Force opam to take account of the new `tezos-deps.opam` ## Force opam to take account of the new `tezos-deps.opam`
opam pin --yes remove tezos-deps opam pin --yes remove tezos-deps

1
src/Makefile.files
View File

@ -312,6 +312,7 @@ NODE_PACKAGES := \
ipv6-multicast \ ipv6-multicast \
irmin.unix \ irmin.unix \
ocplib-resto.directory \ ocplib-resto.directory \
ssl \
EMBEDDED_NODE_PROTOCOLS := \ EMBEDDED_NODE_PROTOCOLS := \
$(patsubst ${SRCDIR}/proto/%/,${SRCDIR}/proto/embedded_proto_%.cmxa, \ $(patsubst ${SRCDIR}/proto/%/,${SRCDIR}/proto/embedded_proto_%.cmxa, \

3
src/node/net/p2p_welcome.ml
View File

@ -43,8 +43,7 @@ let rec worker_loop st =
let create_listening_socket ~backlog ?(addr = Ipaddr.V6.unspecified) port = let create_listening_socket ~backlog ?(addr = Ipaddr.V6.unspecified) port =
let main_socket = Lwt_unix.(socket PF_INET6 SOCK_STREAM 0) in let main_socket = Lwt_unix.(socket PF_INET6 SOCK_STREAM 0) in
Lwt_unix.(setsockopt main_socket SO_REUSEADDR true) ; Lwt_unix.(setsockopt main_socket SO_REUSEADDR true) ;
Lwt_unix.Versioned.bind_2 Lwt_unix.bind main_socket
main_socket
Unix.(ADDR_INET (Ipaddr_unix.V6.to_inet_addr addr, port)) >>= fun () -> Unix.(ADDR_INET (Ipaddr_unix.V6.to_inet_addr addr, port)) >>= fun () ->
Lwt_unix.listen main_socket backlog ; Lwt_unix.listen main_socket backlog ;
Lwt.return main_socket Lwt.return main_socket

2
src/tezos-deps.opam
View File

@ -24,7 +24,7 @@ depends: [
"ipv6-multicast" "ipv6-multicast"
"irmin-watcher" (* for `irmin.unix` *) "irmin-watcher" (* for `irmin.unix` *)
"irmin" {>= "0.12" & < "1.0" } "irmin" {>= "0.12" & < "1.0" }
"lwt" {>= "2.7.0" } "lwt" {>= "3.0.0" }
"lwt_ssl" "lwt_ssl"
"menhir" "menhir"
"mtime" "mtime"