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

Use overlay repo to build MSVC #147

Merged
merged 2 commits into from
Jan 12, 2022
Merged

Use overlay repo to build MSVC #147

merged 2 commits into from
Jan 12, 2022

Conversation

dra27
Copy link
Contributor

@dra27 dra27 commented Jan 5, 2022

This is WIP - opening with a trial version to test the fix.

(loosely) related to ocurrent/ocaml-dockerfile#79

The Visual Studio images haven't been building for months for 4.10, 4.12 and 4.13 owing to the need for either ocaml/ocaml#10797 or ocaml/flexdll#96. This PR opts for the latter by upgrading the embedded flexdll in opam-repository-mingw to 0.40 (which includes that PR).

I've done this by creating a ocurrent/opam-repository-mingw which houses the patch in the patches branch and has a tiny opam repo in the overlay branch containing just the patched opam files.

I don't expect those compiler packages to change in upstream opam-repository-mingw before ocaml-base-compiler gains Windows support in ocaml/opam-repository later this year, but the patches can of course be updated as necessary.

@dra27 dra27 force-pushed the msvc-overlays branch 2 times, most recently from 13f1e38 to 3156d02 Compare January 5, 2022 12:22
@dra27
Copy link
Contributor Author

dra27 commented Jan 6, 2022

This is presently pushed live and appears to be working! Cygwin setup has already been patched, but the change is actually worth forcing anyway (at least while we still use cygsympathy).

@dra27
Copy link
Contributor Author

dra27 commented Jan 6, 2022

This now depends on ocurrent/ocaml-dockerfile#80.

@dra27
Copy link
Contributor Author

dra27 commented Jan 10, 2022

@talex5 / @tmcgilchrist - any objections to the mechanism used here for doing (i.e. having an extra repo which gets selectively added?). It's kernel update day on Wednesday morning, so it'd be nice (though not compulsory) to have this merged before then.

Copy link
Contributor

@talex5 talex5 left a comment

Choose a reason for hiding this comment

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

Having an extra overlay on Windows seems fine to me.

@dra27 dra27 merged commit fbfb71e into ocurrent:master Jan 12, 2022
@dra27 dra27 deleted the msvc-overlays branch January 12, 2022 16:17
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