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.

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

Dependencies and build adjustments #27

Merged
merged 3 commits into from
Oct 20, 2020
Merged

Dependencies and build adjustments #27

merged 3 commits into from
Oct 20, 2020

Conversation

hannesm
Copy link
Member

@hannesm hannesm commented Oct 18, 2020

Minor cleanups, see individual commits for details.

…PATH

The dune version in dune-project is 2.6.0, reflect the same version in opam.
The PKG_CONFIG_PATH is evaluated in lib/bindings/Makefile explicitly, the data
in OPAM_PKG_CONFIG_PATH passed via opam is not respected, remove it.

Also remove unused top-level Makefile.
This is used in activations and xen, avoid implicit dependencies. It is already
declared in the opam file.
@hannesm
Copy link
Member Author

hannesm commented Oct 19, 2020

FWIW I PRed upper bounds & conflicts at ocaml/opam-repository#17430 -- once this is merged, mirage-xen.opam >= 6.0.0 won't need to conflict with mirage-xen-posix,mirage-xen-ocaml,mirage-xen-minios,minios-xen (since all released mirage-xen-ocaml & mirage-xen-posix are in conflict with mirage-xen >= 6.0.0).

Since ocaml/opam-repository#17430 all mirage-xen-ocaml and mirage-xen-posix
conflict with mirage-xen >= 6.0.0. There's no need to put these conflicts in
mirage-xen.
@mato
Copy link
Contributor

mato commented Oct 20, 2020

Thanks!

@mato mato merged commit 6cd6917 into mirage:master Oct 20, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants