From 9ae6bd41643b8ba200a259553c464347df9cc6f2 Mon Sep 17 00:00:00 2001 From: David Scott Date: Tue, 1 Aug 2017 11:24:31 +0100 Subject: [PATCH 1/3] charrua-client-lwt: depend on mirage-time-lwt and duration This fixes the build. Note the CI isn't building this package at the moment. Signed-off-by: David Scott --- charrua-client-lwt.opam | 1 + client/lwt/jbuild | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/charrua-client-lwt.opam b/charrua-client-lwt.opam index 01e7df8..86ceee3 100644 --- a/charrua-client-lwt.opam +++ b/charrua-client-lwt.opam @@ -26,6 +26,7 @@ depends: [ "rresult" "mirage-random" {>= "1.0.0"} "duration" + "mirage-time-lwt" "logs" "tcpip" {>= "3.0.0"} "fmt" diff --git a/client/lwt/jbuild b/client/lwt/jbuild index d5b2247..bad81e3 100644 --- a/client/lwt/jbuild +++ b/client/lwt/jbuild @@ -4,4 +4,5 @@ ((name dhcp_client_lwt) (public_name charrua-client-lwt) (modules (dhcp_client_lwt)) - (libraries (charrua-core.wire lwt charrua-client)))) + (libraries (charrua-core.wire lwt charrua-client + mirage-time-lwt duration)))) From 73405c6929734d987773dca5267cdf7aeda3f1af Mon Sep 17 00:00:00 2001 From: David Scott Date: Tue, 1 Aug 2017 11:30:42 +0100 Subject: [PATCH 2/3] travis: add PINS for charrua-client-{lwt,mirage} Signed-off-by: David Scott --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 70cf833..6ac36c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,7 @@ env: global: - PACKAGE="charrua-core" - TESTS=true - - PINS="charrua-client:. charrua-unix:." - - DEPOPTS="charrua-client charrua-unix" + - PINS="charrua-client:. charrua-unix:. charrua-client:. charrua-client-lwt:. charrua-client-mirage:." matrix: - DISTRO="alpine-3.5" OCAML_VERSION="4.03.0" - DISTRO="centos-6" OCAML_VERSION="4.04.1" From 59ac8c170bae18c134ae35a780b08e9b58577100 Mon Sep 17 00:00:00 2001 From: David Scott Date: Tue, 1 Aug 2017 13:41:42 +0100 Subject: [PATCH 3/3] test: add missing dependency on tcpip.unix The tcpip.unix package contains the checksum C stubs. Signed-off-by: David Scott --- test/client/jbuild | 2 +- test/jbuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/client/jbuild b/test/client/jbuild index a035455..731c5bf 100644 --- a/test/client/jbuild +++ b/test/client/jbuild @@ -2,7 +2,7 @@ (executables ((names (test_client)) - (libraries (cstruct-unix alcotest charrua-client charrua-core.server)))) + (libraries (cstruct-unix alcotest charrua-client charrua-core.server tcpip.unix)))) (alias ((name runtest) diff --git a/test/jbuild b/test/jbuild index de1cc2b..184b839 100644 --- a/test/jbuild +++ b/test/jbuild @@ -3,7 +3,7 @@ (executables ((names (test)) (preprocess (pps (ppx_cstruct))) - (libraries (cstruct-unix io-page.unix charrua-core.server)))) + (libraries (cstruct-unix io-page.unix charrua-core.server tcpip.unix)))) (alias ((name runtest)