Skip to content

Support new locations of unix, str and dynlink#5581

Merged
dra27 merged 1 commit intoocaml:mainfrom
dra27:lib-layout-main
May 24, 2022
Merged

Support new locations of unix, str and dynlink#5581
dra27 merged 1 commit intoocaml:mainfrom
dra27:lib-layout-main

Conversation

@dra27
Copy link
Copy Markdown
Member

@dra27 dra27 commented Apr 16, 2022

Updates Dune for compatibility with the changes proposed in ocaml/ocaml#11198.

Copy link
Copy Markdown
Member

@rgrinberg rgrinberg left a comment

Choose a reason for hiding this comment

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

Needs a CHANGES entry for 2.9.4

@dra27
Copy link
Copy Markdown
Member Author

dra27 commented Apr 16, 2022

It does also need the upstream PR in OCaml to be merged first!

@dra27 dra27 force-pushed the lib-layout-main branch from 82756bc to 908228a Compare May 24, 2022 10:41
@dra27
Copy link
Copy Markdown
Member Author

dra27 commented May 24, 2022

Rebased and added Changes entry to 2.9.4 (is it correct that it goes in the 2.9.4 section with PR number for main?).

The OCaml PR for this is about to be merged.

@dra27 dra27 force-pushed the lib-layout-main branch from 908228a to dbc51dc Compare May 24, 2022 10:50
Signed-off-by: David Allsopp <david.allsopp@metastack.com>
@dra27 dra27 force-pushed the lib-layout-main branch from dbc51dc to 3a43585 Compare May 24, 2022 16:08
@dra27 dra27 merged commit 2457dde into ocaml:main May 24, 2022
@lthls
Copy link
Copy Markdown

lthls commented Feb 2, 2023

The flambda-backend compiler is planning to integrate ocaml/ocaml#11198 on a 4.14 branch, so we'd like some support for that in dune too. I've got a patch which more or less lowers the version bound for the code of this PR to 4.14, which should work because using the new code on a vanilla 4.14 compiler will still produce the expected result.
Should I submit this patch as a pull request ?

@dra27
Copy link
Copy Markdown
Member Author

dra27 commented Feb 3, 2023

Presumably it also has to check for the files in two locations for the exists_if tests? Regardless, a PR with the patch seems the way to go, yes.

@lthls
Copy link
Copy Markdown

lthls commented Feb 3, 2023

Could you point me to the exists_if tests in question ? I have patched the check for natdynlink support, but I haven't seen any other place where this was relevant.

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