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

Add js_of_ocaml alpha #352

Open
wants to merge 5 commits into
base: main
Choose a base branch
from

Conversation

moazzammoriani
Copy link
Contributor

@moazzammoriani moazzammoriani commented Jun 3, 2022

This is a draft PR that's related to #18. Certain packages were pinned to the Makefile due to the incompatibility of Sandmark with the alpha repo at the time of writing this. The build currently fails due to some conflicts that occur with js_of_ocaml within the Sandmark universe.

@moazzammoriani moazzammoriani changed the title Add alpha js_of_ocaml Add js_of_ocaml alpha Jun 3, 2022
@@ -138,6 +138,8 @@ _opam/%: _opam/opam-init/init.sh ocaml-versions/%.json
opam pin add -n --yes --switch $* base.v0.14.3 https://github.com/janestreet/base.git#v0.14.3
opam pin add -n --yes --switch $* coq-core https://github.com/ejgallego/coq/archive/refs/tags/multicore-2021-09-29.tar.gz
opam pin add -n --yes --switch $* coq-stdlib https://github.com/ejgallego/coq/archive/refs/tags/multicore-2021-09-29.tar.gz
opam pin add -n --yes --switch $* dune https://github.com/dra27/dune/archive/2.9.3-5.0.0.tar.gz
Copy link
Contributor

Choose a reason for hiding this comment

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

Sandmark has been updated to build with dune-2.9.3-5.0.0 and ocamlfind.1.9.3.git. Kindly pull the latest changes from the -main branch.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I still have to pin dune to the appropriate repo, right?

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes. I have added the instructions in the README at https://github.com/ocaml-bench/sandmark/blob/main/README.md?plain=1#L24.

]
dev-repo: "git+https://github.com/ocaml/num.git"
url {
src: "https://github.com/ocaml/num/archive/v1.4.tar.gz"
Copy link
Contributor

Choose a reason for hiding this comment

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

Please avoid adding manual dependencies to Sandmark. num.1.3is already specified in dev.opam at https://github.com/ocaml-bench/sandmark/blob/main/dependencies/template/dev.opam#L42. It is recommended to add dependencies only to dev.opam. The dependencies/packages folder is for packages with custom patches.

@shakthimaan
Copy link
Contributor

Sandmark has been updated to build for 5.1.0+trunk. @ElectreAAS Please review the conflicting files in order to build js_of_ocaml with Sandmark.

@ElectreAAS
Copy link
Contributor

sandmark has moved to 5.1.0+trunk, we probably need a new version of js_of_ocaml that doesn't conflict with that

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.

3 participants