Skip to content

Always build nocrypto.mirage when mirage-entropy is installed #124

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

Merged
pqwy merged 3 commits into from
Oct 1, 2017
Merged

Always build nocrypto.mirage when mirage-entropy is installed #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f92410
Import opam file from opam-repository
samoht Jul 18, 2017
7165209
compile nocrypto.mirage when mirage-entropy is installed
samoht Jul 18, 2017
ce42778
Merge branch 'master' into nocrypto-mirage
pqwy Oct 1, 2017
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
8 changes: 5 additions & 3 deletions opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ available: [ ocaml-version >= "4.02.0" ]
build: ["ocaml" "pkg/pkg.ml" "build" "--pinned" "%{pinned}%" "--tests" "false"
"--with-lwt" "%{lwt:installed}%"
"--xen" "%{mirage-xen:installed}%"
"--mirage" "%{mirage-entropy:installed}%"
"--freestanding" "%{mirage-solo5:installed}%"]

depends: [
Expand All @@ -28,14 +29,15 @@ depends: [
"zarith"
"lwt"
"sexplib"
("mirage-no-xen" | ("mirage-xen" & "mirage-entropy" & "zarith-xen"))
("mirage-no-solo5" | ("mirage-solo5" & "mirage-entropy" & "zarith-freestanding"))
("mirage-no-xen" | ("mirage-xen" & "zarith-xen"))
("mirage-no-solo5" | ("mirage-solo5" & "zarith-freestanding"))
]

depopts: ["mirage-entropy"]

conflicts: [
"topkg" {<"0.8.0"}
"ocb-stubblr" {<"0.1.0"}
"mirage-xen" {<"2.2.0"}
"sexplib" {="v0.9.0"}
]

5 changes: 4 additions & 1 deletion pkg/pkg.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ let xen = Conf.(key "xen" bool ~absent:false
~doc:"Build Mirage/Xen support.")
let fs = Conf.(key "freestanding" bool ~absent:false
~doc:"Build Mirage/Solo5 support.")
let mir = Conf.(key "mirage" bool ~absent:false
~doc:"Build Mirage support.")
let accelerate = Conf.(discovered_key "accelerate" bool
~absent:cpudetect
~env:"NOCRYPTO_ACCELERATE"
Expand All @@ -40,11 +42,12 @@ let () =
let lwt = Conf.value c lwt && unix
and xen = Conf.value c xen
and fs = Conf.value c fs in
let mir = Conf.value c mir in
Ok [ Pkg.clib "src/libnocrypto_stubs.clib";
Pkg.mllib "src/nocrypto.mllib";
Pkg.mllib ~cond:unix "unix/nocrypto_unix.mllib";
Pkg.mllib ~cond:lwt "lwt/nocrypto_lwt.mllib";
Pkg.mllib ~cond:(xen||fs) "mirage/nocrypto_mirage.mllib";
Pkg.mllib ~cond:mir "mirage/nocrypto_mirage.mllib";
Pkg.test "tests/testrunner";
Pkg.test ~run:false "bench/speed";
mirage ~xen ~fs "src/libnocrypto_stubs.clib"; ]