Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix conduit build with mirage3 #190

Closed
wants to merge 6 commits into from
Closed

Fix conduit build with mirage3 #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a8f23be
conduit now tested on 4.04 and with mirage-dev
avsm Dec 30, 2016
b84f874
conduit_mirage: use the pp for tcp defined in mirage_runtime now
avsm Dec 30, 2016
193a206
travis: discover in verbose mod
avsm Dec 30, 2016
ee4768c
pass the configure verbose flag in the opam file instead
avsm Dec 30, 2016
5a8198e
Merge branch 'master' into fix-conduit-with-mirage3
avsm Dec 30, 2016
6911d99
mirage: also depend on mirage-runtime for the pp functions
avsm Dec 31, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@ env:
global:
- PACKAGE="conduit"
- DEPOPTS="async_ssl lwt mirage-dns ssl tls"
- EXTRA_REMOTES="https://github.com/mirage/mirage-dev.git"
- FORK_BRANCH=HEAD
matrix:
- DISTRO=debian-stable OCAML_VERSION=4.02.3
- DISTRO=debian-testing OCAML_VERSION=4.02.3
- DISTRO=debian-unstable OCAML_VERSION=4.02.3
- DISTRO=debian-unstable OCAML_VERSION=4.04.0
- DISTRO=ubuntu-12.04 OCAML_VERSION=4.02.3
- DISTRO=ubuntu-16.04 OCAML_VERSION=4.03.0
- DISTRO=centos-6 OCAML_VERSION=4.02.3
Expand Down
2 changes: 1 addition & 1 deletion discover.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ let async_ssl = Flag.mk "async_ssl" ["async_ssl"]
let lwt = Flag.mk "lwt" ["lwt"]
let lwt_ssl = Flag.mk "lwt_ssl" ["lwt.ssl"]
let lwt_tls = Flag.mk "lwt_tls" ["tls.lwt"]
let mirage = Flag.mk "mirage" ["mirage-flow-lwt"; "dns.mirage"]
let mirage = Flag.mk "mirage" ["mirage-flow-lwt"; "mirage-runtime"; "dns.mirage"]
let mirage_tls = Flag.mk "mirage_tls" ["tls"; "tls.mirage"]
let vchan = Flag.mk "vchan" ["vchan"]
let vchan_lwt = Flag.mk "vchan_lwt" ["vchan.lwt"]
Expand Down
2 changes: 1 addition & 1 deletion lib/conduit_mirage.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ module TCP (S: V1_LWT.STACKV4) = struct
type client = tcp_client [@@deriving sexp]
type server = tcp_server [@@deriving sexp]
let err_tcp e = Lwt.fail @@ Failure
(Format.asprintf "TCP connection failed: %a" S.TCPV4.pp_error e)
(Format.asprintf "TCP connection failed: %a" Mirage_runtime.pp_tcp_error e)

let connect t (`TCP (ip, port): client) =
match Ipaddr.to_v4 ip with
Expand Down
2 changes: 1 addition & 1 deletion opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ bug-reports: "https://github.com/mirage/ocaml-conduit/issues"
tags: "org:mirage"
license: "ISC"

build: [["./configure"] [make]]
build: [["env" "CONDUIT_DISCOVER_VERBOSE=1" "./configure"] [make]]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't mind if we get rid of this variable and always write the "verbose" output as well.

install: [make "install"]
remove: ["ocamlfind" "remove" "conduit"]
build-doc: [make "doc"]
Expand Down