Skip to content

Commit c73fa7e

Browse files
committed
Dependencies of cohttp don't like openbsd
1 parent 6d64d24 commit c73fa7e

File tree

5 files changed

+23
-8
lines changed

5 files changed

+23
-8
lines changed

dune-project

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,16 @@
8686

8787
(package
8888
(name picos_io_cohttp)
89+
(allow_empty)
8990
(synopsis "Cohttp running on Picos IO")
9091
(depends
9192
(picos_io
9293
(= :version))
9394
;;
9495
(cohttp
95-
(>= 6.0.0~beta2))
96+
(and
97+
(>= 6.0.0~beta2)
98+
(<> :os "openbsd")))
9699
(fmt
97100
(>= 0.9.0))
98101
(uri
@@ -150,7 +153,9 @@
150153
(picos_io
151154
(= :version))
152155
(picos_io_cohttp
153-
(= :version))
156+
(and
157+
(= :version)
158+
(<> :os "openbsd")))
154159
(picos_mux
155160
(= :version))
156161
(picos_lwt
@@ -176,16 +181,19 @@
176181
(cohttp
177182
(and
178183
(>= 6.0.0~beta2)
184+
(<> :os "openbsd")
179185
:with-test))
180186
(cohttp-lwt-unix
181187
(and
182188
(>= 6.0.0~beta2)
183189
(<> :os "win32")
190+
(<> :os "openbsd")
184191
:with-test))
185192
(conduit-lwt-unix
186193
(and
187194
(>= 6.2.2)
188195
(<> :os "win32")
196+
(<> :os "openbsd")
189197
:with-test))
190198
(conf-npm
191199
(and
@@ -224,6 +232,7 @@
224232
(cohttp-lwt
225233
(and
226234
(>= 6.0.0~beta2)
235+
(<> :os "openbsd")
227236
:with-test))
228237
(qcheck-multicoretests-util
229238
(and

lib/picos_io_cohttp/dune

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
(library
22
(name picos_io_cohttp)
33
(public_name picos_io_cohttp)
4+
(optional)
45
(libraries
56
(re_export cohttp)
67
(re_export picos_io)
@@ -13,6 +14,7 @@
1314
(package picos_meta)
1415
(enabled_if
1516
(and
17+
(<> %{system} "openbsd")
1618
(>= %{ocaml_version} 5.1.0)
1719
(= %{env:OPAM_REPO_CI=false} false)))
1820
(libraries

picos_io_cohttp.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ bug-reports: "https://github.com/ocaml-multicore/picos/issues"
1010
depends: [
1111
"dune" {>= "3.14"}
1212
"picos_io" {= version}
13-
"cohttp" {>= "6.0.0~beta2"}
13+
"cohttp" {>= "6.0.0~beta2" & os != "openbsd"}
1414
"fmt" {>= "0.9.0"}
1515
"uri" {>= "4.4.0"}
1616
"odoc" {with-doc}

picos_meta.opam

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ depends: [
1313
"picos_aux" {= version}
1414
"picos_std" {= version}
1515
"picos_io" {= version}
16-
"picos_io_cohttp" {= version}
16+
"picos_io_cohttp" {= version & os != "openbsd"}
1717
"picos_mux" {= version}
1818
"picos_lwt" {= version}
1919
"dscheck" {>= "0.4.0"}
@@ -22,9 +22,11 @@ depends: [
2222
"qcheck-stm" {>= "0.3"}
2323
"alcotest" {>= "1.7.0" & with-test}
2424
"backoff" {>= "0.1.0" & with-test}
25-
"cohttp" {>= "6.0.0~beta2" & with-test}
26-
"cohttp-lwt-unix" {>= "6.0.0~beta2" & os != "win32" & with-test}
27-
"conduit-lwt-unix" {>= "6.2.2" & os != "win32" & with-test}
25+
"cohttp" {>= "6.0.0~beta2" & os != "openbsd" & with-test}
26+
"cohttp-lwt-unix"
27+
{>= "6.0.0~beta2" & os != "win32" & os != "openbsd" & with-test}
28+
"conduit-lwt-unix"
29+
{>= "6.2.2" & os != "win32" & os != "openbsd" & with-test}
2830
"conf-npm"
2931
{arch != "x86_32" & arch != "riscv64" & os != "win32" & with-test}
3032
"domain_shims" {>= "0.1.0" & with-test}
@@ -34,7 +36,7 @@ depends: [
3436
"multicore-magic" {>= "2.3.0" & with-test}
3537
"multicore-magic-dscheck" {>= "2.3.0" & with-test}
3638
"ocaml-version" {>= "3.6.4" & with-test}
37-
"cohttp-lwt" {>= "6.0.0~beta2" & with-test}
39+
"cohttp-lwt" {>= "6.0.0~beta2" & os != "openbsd" & with-test}
3840
"qcheck-multicoretests-util" {>= "0.3" & with-test}
3941
"uri" {>= "4.4.0" & with-test}
4042
"odoc" {>= "2.4.1" & with-doc}

test/dune

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@
120120
(package picos_meta)
121121
(name test_io_cohttp)
122122
(modules test_io_cohttp)
123+
(build_if %{lib-available:picos_io_cohttp})
123124
(libraries
124125
picos_io_cohttp
125126
picos_std.finally
@@ -273,6 +274,7 @@
273274
(build_if
274275
(and
275276
(>= %{ocaml_version} 5)
277+
%{lib-available:cohttp-lwt-unix}
276278
%{lib-available:conduit-lwt-unix}))
277279
(libraries
278280
cohttp

0 commit comments

Comments
 (0)