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

[2.9] Compatibility with OCaml 5.0 #5351

Merged
merged 3 commits into from
Jan 20, 2022
Merged

[2.9] Compatibility with OCaml 5.0 #5351

merged 3 commits into from
Jan 20, 2022

Conversation

emillon
Copy link
Collaborator

@emillon emillon commented Jan 18, 2022

This PR consists in 2 cherry-picked commits about compatibility with current trunk, related to the format API.

rgrinberg and others added 2 commits January 18, 2022 10:22
do not use deprecated Format functions

Signed-off-by: Rudi Grinberg <[email protected]>

ps-id: 7DBD82E0-2A3C-4C2C-AE1D-3A0FFE042BD6
It used to rely on the deprecated tag API, which is going away in 5.0.
Using this patch, `make dune.exe` works with the current trunk
(310541fe74dddcf05c17ae3f9d4feaace4a57287).

Signed-off-by: Etienne Millon <[email protected]>
@emillon emillon requested a review from rgrinberg as a code owner January 18, 2022 09:52
Signed-off-by: Etienne Millon <[email protected]>
@emillon emillon added this to the 2.9.2 milestone Jan 18, 2022
@emillon
Copy link
Collaborator Author

emillon commented Jan 18, 2022

xref #5338 #5350

@ejgallego ejgallego self-assigned this Jan 18, 2022
Copy link
Collaborator

@ejgallego ejgallego left a comment

Choose a reason for hiding this comment

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

LGTM thanks.

CI errors are unrelated.

@ejgallego ejgallego merged commit c21d36b into 2.9 Jan 20, 2022
@ejgallego ejgallego deleted the compat-5.0-dune-2.9 branch January 20, 2022 15:49
kit-ty-kate pushed a commit to ocaml/opam-repository that referenced this pull request Jan 23, 2022
CHANGES:

- Fix missing -linkall flag when linking library dune-sites.plugin
  ( ocaml/dune#4348, @Kakadu, @bobot, reported by @Kakadu)

- No longer reference deprecated Toploop functions when using dune files in
  OCaml syntax. (ocaml/dune#4834, fixes ocaml/dune#4830, @nojb)

- Use the stag format API to be compatible with OCaml 5.0 (ocaml/dune#5351, @emillon).

- Fix post-processing of dune-package (fix ocaml/dune#4389, @strub)
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