From 24b5290a741b9be42550b7d13367047fe057c311 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Henry?= Date: Fri, 31 Mar 2017 16:54:50 +0200 Subject: [PATCH] Opam: use the `libev` backend of Lwt. --- scripts/Dockerfile.binaries.in | 2 +- src/tezos-deps.opam | 1 + src/utils/lwt_utils.ml | 4 ---- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/scripts/Dockerfile.binaries.in b/scripts/Dockerfile.binaries.in index 757781da5..40807b6d1 100644 --- a/scripts/Dockerfile.binaries.in +++ b/scripts/Dockerfile.binaries.in @@ -4,7 +4,7 @@ LABEL distro_style="apk" distro="alpine" distro_long="alpine-$alpine_version" ar RUN apk update && \ apk upgrade && \ - apk add sudo bash libssl1.0 libsodium gmp git && \ + apk add sudo bash libssl1.0 libsodium libev gmp git && \ rm -f /var/cache/apk/* && \ adduser -S tezos && \ echo 'tezos ALL=(ALL:ALL) NOPASSWD:ALL' > /etc/sudoers.d/tezos && \ diff --git a/src/tezos-deps.opam b/src/tezos-deps.opam index cbde8c0f3..6d7d513d9 100644 --- a/src/tezos-deps.opam +++ b/src/tezos-deps.opam @@ -15,6 +15,7 @@ depends: [ "ocamlfind" {build} "base-bigarray" "base-threads" + "conf-libev" "calendar" "cohttp" {>= "0.21" } "conduit" diff --git a/src/utils/lwt_utils.ml b/src/utils/lwt_utils.ml index f4c5020e9..04055c086 100644 --- a/src/utils/lwt_utils.ml +++ b/src/utils/lwt_utils.ml @@ -7,10 +7,6 @@ (* *) (**************************************************************************) -(** HACK waiting for Pierre.... *) -let () = Lwt_unix.set_default_async_method Async_none -(** END OF HACK waiting for Pierre.... *) - module LC = Lwt_condition open Lwt.Infix