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.

Sign up for GitHub

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

Jump to bottom

x-compilation: take host findlib.conf into account when cross-compiling #7428

Merged
merged 1 commit into from
Apr 7, 2023
Merged

x-compilation: take host findlib.conf into account when cross-compiling #7428

merged 1 commit into from
Apr 7, 2023

Conversation

anmonteiro
Copy link
Collaborator

@anmonteiro anmonteiro commented Mar 28, 2023 •
edited
Loading

  • The first 3 commits are a port of Prefer findlib over PATH #1707 to the new dune codebase. I couldn't cherry pick the commits because the branch seems gone and git can't find the SHAs anywhere
  • the 4th commit fixes the bug after the setup in the first 3, and promotes the newly passing test

fixes #1701

@anmonteiro anmonteiro force-pushed the anmonteiro/findlib-for-cross branch 3 times, most recently from 8d7c0b0 to 466ae20 Compare March 28, 2023 05:49
@anmonteiro anmonteiro mentioned this pull request Mar 28, 2023
Merged
@anmonteiro anmonteiro force-pushed the anmonteiro/findlib-for-cross branch from 466ae20 to 55d8e9a Compare March 28, 2023 06:19
@anmonteiro anmonteiro marked this pull request as ready for review March 28, 2023 06:43
anmonteiro
anmonteiro commented Mar 28, 2023
View reviewed changes
src/dune_rules/context.ml Outdated Show resolved Hide resolved
@anmonteiro anmonteiro force-pushed the anmonteiro/findlib-for-cross branch from 55d8e9a to 12395d2 Compare March 28, 2023 07:01
@anmonteiro anmonteiro requested a review from rgrinberg March 28, 2023 07:50
@anmonteiro anmonteiro force-pushed the anmonteiro/findlib-for-cross branch from 12395d2 to 5e5fd76 Compare March 29, 2023 07:30
@anmonteiro
Copy link
Collaborator Author

I've verified that this works on my cross-compilation setup as well.

@rgrinberg
Copy link
Member

Are the last 2 commits independent fixes?

@anmonteiro
Copy link
Collaborator Author

Are the last 2 commits independent fixes?

Nope, they're fixing bugs I had introduced in my implementation.

I'm not sure how to organize the commits here. if you want to preserve the commits you added in #1707, I'm happy to preserve them. Otherwise happy to squash everything together too.

@rgrinberg
Copy link
Member

I'm happy to preserve them. Otherwise happy to squash everything together too.

I would squash everything in the end

@anmonteiro anmonteiro force-pushed the anmonteiro/findlib-for-cross branch from 668b185 to f2cc2f1 Compare March 29, 2023 21:56
@anmonteiro anmonteiro requested a review from rgrinberg March 29, 2023 22:33
@anmonteiro anmonteiro force-pushed the anmonteiro/findlib-for-cross branch from 2a1d777 to afb1ab7 Compare March 29, 2023 22:43
@anmonteiro
Copy link
Collaborator Author

This should be ready for another look.

anmonteiro added a commit to nix-ocaml/nix-overlays that referenced this pull request Mar 30, 2023
@anmonteiro
new version
eb6a70f 
has ocaml/dune#7450 and
ocaml/dune#7428
anmonteiro added a commit to nix-ocaml/nix-overlays that referenced this pull request Mar 30, 2023
@anmonteiro
new version
ce2e7a8 
has ocaml/dune#7450 and
ocaml/dune#7428
@anmonteiro anmonteiro force-pushed the anmonteiro/findlib-for-cross branch 2 times, most recently from 43cf215 to 34a31b1 Compare March 31, 2023 07:46
anmonteiro added a commit to nix-ocaml/nix-overlays that referenced this pull request Mar 31, 2023
@anmonteiro
new version
463f25b 
has ocaml/dune#7450 and
ocaml/dune#7428
@anmonteiro anmonteiro force-pushed the anmonteiro/findlib-for-cross branch from 2d4ebb2 to 302b45c Compare April 1, 2023 00:12
anmonteiro added a commit to nix-ocaml/nix-overlays that referenced this pull request Apr 1, 2023
@anmonteiro
new version
90f6d4d 
has ocaml/dune#7450 and
ocaml/dune#7428
@anmonteiro anmonteiro force-pushed the anmonteiro/findlib-for-cross branch from 302b45c to 02260ce Compare April 3, 2023 22:24
@anmonteiro anmonteiro mentioned this pull request Apr 5, 2023
Closed
@anmonteiro anmonteiro force-pushed the anmonteiro/findlib-for-cross branch from 02260ce to 6065172 Compare April 6, 2023 20:48
rgrinberg
rgrinberg reviewed Apr 6, 2023
View reviewed changes
src/dune_rules/context.ml Outdated Show resolved Hide resolved
rgrinberg
rgrinberg reviewed Apr 6, 2023
View reviewed changes
src/dune_rules/context.ml Outdated Show resolved Hide resolved
rgrinberg
rgrinberg reviewed Apr 6, 2023
View reviewed changes
src/dune_rules/context.ml Outdated Show resolved Hide resolved
@anmonteiro anmonteiro force-pushed the anmonteiro/findlib-for-cross branch 2 times, most recently from ac5b6b6 to 8580d4c Compare April 7, 2023 05:24
rgrinberg
rgrinberg approved these changes Apr 7, 2023
View reviewed changes
Copy link
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.

The tests need to be updated, but otherwise this is good to go.

@anmonteiro anmonteiro force-pushed the anmonteiro/findlib-for-cross branch from 8580d4c to 71cb666 Compare April 7, 2023 20:45
@anmonteiro @rgrinberg
x-compilation: take host findlib.conf into account when cross-compiling
f630480 
Signed-off-by: Antonio Nuno Monteiro <[email protected]>
Co-authored-by: Rudi Grinberg <[email protected]>
@anmonteiro anmonteiro force-pushed the anmonteiro/findlib-for-cross branch from 71cb666 to f630480 Compare April 7, 2023 20:47
@anmonteiro anmonteiro merged commit 8b7133d into ocaml:main Apr 7, 2023
@anmonteiro anmonteiro deleted the anmonteiro/findlib-for-cross branch April 7, 2023 21:06
anmonteiro added a commit to nix-ocaml/nix-overlays that referenced this pull request Apr 7, 2023
@anmonteiro
new version
d04c5fd 
has ocaml/dune#7450 and
ocaml/dune#7428
anmonteiro added a commit to nix-ocaml/nix-overlays that referenced this pull request Apr 8, 2023
@anmonteiro
x-compilation: pick up the dune fixes and use dune install (#716)
ef176ca 
* x-compilation: pick up the dune fixes and use `dune install`

* new fix

* one more prefix lol

* new version

has ocaml/dune#7450 and
ocaml/dune#7428

* ocamlyacc

* can't run hooks because other drvs use `${topkg.buildPhase} args`

* remove pkg-config hack

* wip

* sans ocamlpath

* even better

* more simplification

* more fixes

* missing dep
@emillon emillon mentioned this pull request Apr 18, 2023
Closed
emillon added a commit to emillon/opam-repository that referenced this pull request Apr 18, 2023
@emillon
[new release] dune (15 packages) (3.8.0~alpha1)
8f04d31 
CHANGES:

- When a rule's action is interrupted, delete any leftover directory targets.
  This is consistent with how we treat file targets. (@rgrinberg, 7564)

- Fix plugin loading with findlib. The functionality was broken in 3.7.0.
  (ocaml/dune#7556, @anmonteiro)

- Introduce a `public_headers` field on libraries. This field is like
  `install_c_headers`, but it allows to choose the extension and choose the
  paths for the installed headers. (ocaml/dune#7512, @rgrinberg)

- Load the host context `findlib.conf` when cross-compiling (ocaml/dune#7428, fixes
  ocaml/dune#1701, @rgrinberg, @anmonteiro)

- Resolve `ppx_runtime_libraries` in the target context when cross compiling
  (ocaml/dune#7450, fixes ocaml/dune#2794, @anmonteiro)

- Use `$PKG_CONFIG`, when set, to find the `pkg-config` binary  (ocaml/dune#7469, fixes
  ocaml/dune#2572, @anmonteiro)

- Preliminary support for Coq compiled intefaces (`.vos` files) enabled via
  `(mode vos)` in `coq.theory` stanzas. This can be used in combination with
  `dune coq top` to obtain fast re-building of dependencies (with no checking
  of proofs) prior to stepping into a file. (ocaml/dune#7406, @rlepigre)

- Fix dune crashing on MacOS in watch mode whenever `$PATH` contains `$PWD`
  (ocaml/dune#7441, fixes ocaml/dune#6907, @rgrinberg)

- Fix `dune install` when cross compiling (ocaml/dune#7410, fixes ocaml/dune#6191, @anmonteiro,
  @rizo)

- Find `pps` dependencies in the host context when cross-compiling,  (ocaml/dune#7410,
  fixes ocaml/dune#4156, @anmonteiro)

- Dune in watch mode no longer builds concurrent rules in serial (ocaml/dune#7395
  @rgrinberg, @jchavarri)

- `dune coq top` now correctly respects the project root when called from a
  subdirectory. However, absolute filenames passed to `dune coq top` are no
  longer supported (due to being buggy) (ocaml/dune#7357, fixes ocaml/dune#7344, @rlepigre and
  @Alizter)

- Added a `--no-build` option to `dune coq top` for avoiding rebuilds (ocaml/dune#7380,
  fixes ocaml/dune#7355, @Alizter)

- RPC: Ignore SIGPIPE when clients suddenly disconnect (ocaml/dune#7299, ocaml/dune#7319, fixes
  ocaml/dune#6879, @rgrinberg)

- Always clean up the UI on exit. (ocaml/dune#7271, fixes ocaml/dune#7142 @rgrinberg)

- Bootstrap: remove reliance on shell. Previously, we'd use the shell to get
  the number of processors. (ocaml/dune#7274, @rgrinberg)

- Bootstrap: correctly detect the number of processors by allowing `nproc` to be
  looked up in `$PATH` (ocaml/dune#7272, @Alizter)

- Speed up file copying on macos by using `clonefile` when available
  (@rgrinberg, ocaml/dune#7210)

- Adds support for loading plugins in toplevels (ocaml/dune#6082, fixes ocaml/dune#6081,
  @ivg, @richardlford)

- Support commands that output 8-bit and 24-bit colors in the terminal (ocaml/dune#7188,
  @Alizter)

- Speed up rule generation for libraries and executables with many modules
  (ocaml/dune#7187, @jchavarri)

- Add `--watch-exclusions` to Dune build options (ocaml/dune#7216, @jonahbeckford)

- Do not re-render UI on every frame if the UI doesn't change (ocaml/dune#7186, fix
  ocaml/dune#7184, @rgrinberg)

- Make coq_db creation in scope lazy (@ejgallego, ocaml/dune#7133)

- Non-user proccesses such as version control or config checking are now run
  silently. (ocaml/dune#6994, fixes ocaml/dune#4066, @Alizter)

- Add the `--display-separate-messages` flag to separate the error messages
  produced by commands with a blank line. (ocaml/dune#6823, fixes ocaml/dune#6158, @esope)

- Accept the Ordered Set Language for the `modes` field in `library` stanzas
  (ocaml/dune#6611, @anmonteiro).

- dune install now respects --display quiet mode (ocaml/dune#7116, fixes ocaml/dune#4573, fixes
  ocaml/dune#7106, @Alizter)

- Stub shared libraries (dllXXX_stubs.so) in Dune-installed libraries could not
  be used as dependencies of libraries in the workspace (eg when compiling to
  bytecode and/or Javascript).  This is now fixed. (ocaml/dune#7151, @nojb)

- Allow the main module of a library with `(stdlib ...)` to depend on other
  libraries (ocaml/dune#7154, @anmonteiro).

- Bytecode executables built for JSOO are linked with `-noautolink` and no
  longer depend on the shared stubs of their dependent libraries (ocaml/dune#7156, @nojb)

- Added a new user action `(concurrent )` which is like `(progn )` but runs the
  actions concurrently. (ocaml/dune#6933, @Alizter)

- Allow `(stdlib ...)` to be used with `(wrapped false)` in library stanzas
  (ocaml/dune#7139, @anmonteiro).

- Allow parallel execution of inline tests partitions (ocaml/dune#7012, @hhugo)

- Support `(link_flags ...)` in `(cinaps ...)` stanza. (ocaml/dune#7423, fixes ocaml/dune#7416,
  @nojb)

- Allow `(package ...)` in any position within `(rule ...)` stanza (ocaml/dune#7445,
  @Leonidas-from-XIV)

- Always include `opam` files in the generated `.install` file. Previously, it
  would not be included whenever `(generate_opam_files true)` was set and the
  `.install` file wasn't yet generated. (ocaml/dune#7547, @rgrinberg)
@emillon emillon mentioned this pull request May 23, 2023
Merged
emillon added a commit to emillon/opam-repository that referenced this pull request May 23, 2023
@emillon
[new release] dune (15 packages) (3.8.0)
df1ab22 
CHANGES:

- Fix string quoting in the json file written by `--trace-file` (ocaml/dune#7773,
  @rleshchinskiy)

- Read `pkg-config` arguments from the `PKG_CONFIG_ARGN` environment variable
  (ocaml/dune#1492, ocaml/dune#7734, @anmonteiro)

- Correctly set `MANPATH` in `dune exec`. Previously, we would use the `bin/`
  directory of the context. (ocaml/dune#7655, @rgrinberg)

- Allow overriding the `ocaml` binary with findlib configuration (ocaml/dune#7648,
  @rgrinberg)

- merlin: ignore instrumentation settings for preprocessing. (ocaml/dune#7606, fixes
  ocaml/dune#7465, @Alizter)

- When a rule's action is interrupted, delete any leftover directory targets.
  This is consistent with how we treat file targets. (ocaml/dune#7564, @rgrinberg)

- Fix plugin loading with findlib. The functionality was broken in 3.7.0.
  (ocaml/dune#7556, @anmonteiro)

- Introduce a `public_headers` field on libraries. This field is like
  `install_c_headers`, but it allows to choose the extension and choose the
  paths for the installed headers. (ocaml/dune#7512, @rgrinberg)

- Load the host context `findlib.conf` when cross-compiling (ocaml/dune#7428, fixes
  ocaml/dune#1701, @rgrinberg, @anmonteiro)

- Add a `coqdoc_flags` field to the `coq.theory` stanza allowing the user to
  pass extra arguments to `coqdoc`. (ocaml/dune#7676, fixes ocaml/dune#7954 @Alizter)

- Resolve `ppx_runtime_libraries` in the target context when cross compiling
  (ocaml/dune#7450, fixes ocaml/dune#2794, @anmonteiro)

- Use `$PKG_CONFIG`, when set, to find the `pkg-config` binary  (ocaml/dune#7469, fixes
  ocaml/dune#2572, @anmonteiro)

- Modules that were declared in `(modules_without_implementation)`,
  `(private_modules)` or `(virtual_modules)` but not declared in `(modules)`
  will cause Dune to emit a warning which will become an error in 3.9. (ocaml/dune#7608,
  fixes ocaml/dune#7026, @Alizter)

- Preliminary support for Coq compiled intefaces (`.vos` files) enabled via
  `(mode vos)` in `coq.theory` stanzas. This can be used in combination with
  `dune coq top` to obtain fast re-building of dependencies (with no checking
  of proofs) prior to stepping into a file. (ocaml/dune#7406, @rlepigre)

- Fix dune crashing on MacOS in watch mode whenever `$PATH` contains `$PWD`
  (ocaml/dune#7441, fixes ocaml/dune#6907, @rgrinberg)

- Fix `dune install` when cross compiling (ocaml/dune#7410, fixes ocaml/dune#6191, @anmonteiro,
  @rizo)

- Find `pps` dependencies in the host context when cross-compiling,  (ocaml/dune#7410,
  fixes ocaml/dune#4156, @anmonteiro)

- Dune in watch mode no longer builds concurrent rules in serial (ocaml/dune#7395
  @rgrinberg, @jchavarri)

- Dune can now detect Coq theories from outside the workspace. This allows for
  composition with installed theories (not necessarily installed with Dune).
  (ocaml/dune#7047, @Alizter, @ejgallego)

- `dune coq top` now correctly respects the project root when called from a
  subdirectory. However, absolute filenames passed to `dune coq top` are no
  longer supported (due to being buggy) (ocaml/dune#7357, fixes ocaml/dune#7344, @rlepigre and
  @Alizter)

- Added a `--no-build` option to `dune coq top` for avoiding rebuilds (ocaml/dune#7380,
  fixes ocaml/dune#7355, @Alizter)

- RPC: Ignore SIGPIPE when clients suddenly disconnect (ocaml/dune#7299, ocaml/dune#7319, fixes
  ocaml/dune#6879, @rgrinberg)

- Always clean up the UI on exit. (ocaml/dune#7271, fixes ocaml/dune#7142 @rgrinberg)

- Bootstrap: remove reliance on shell. Previously, we'd use the shell to get
  the number of processors. (ocaml/dune#7274, @rgrinberg)

- Bootstrap: correctly detect the number of processors by allowing `nproc` to be
  looked up in `$PATH` (ocaml/dune#7272, @Alizter)

- Speed up file copying on macos by using `clonefile` when available
  (@rgrinberg, ocaml/dune#7210)

- Adds support for loading plugins in toplevels (ocaml/dune#6082, fixes ocaml/dune#6081,
  @ivg, @richardlford)

- Support commands that output 8-bit and 24-bit colors in the terminal (ocaml/dune#7188,
  @Alizter)

- Speed up rule generation for libraries and executables with many modules
  (ocaml/dune#7187, @jchavarri)

- Add `--watch-exclusions` to Dune build options (ocaml/dune#7216, @jonahbeckford)

- Do not re-render UI on every frame if the UI doesn't change (ocaml/dune#7186, fix
  ocaml/dune#7184, @rgrinberg)

- Make coq_db creation in scope lazy (@ejgallego, ocaml/dune#7133)

- Non-user proccesses such as version control or config checking are now run
  silently. (ocaml/dune#6994, fixes ocaml/dune#4066, @Alizter)

- Add the `--display-separate-messages` flag to separate the error messages
  produced by commands with a blank line. (ocaml/dune#6823, fixes ocaml/dune#6158, @esope)

- Accept the Ordered Set Language for the `modes` field in `library` stanzas
  (ocaml/dune#6611, @anmonteiro).

- dune install now respects --display quiet mode (ocaml/dune#7116, fixes ocaml/dune#4573, fixes
  ocaml/dune#7106, @Alizter)

- Stub shared libraries (dllXXX_stubs.so) in Dune-installed libraries could not
  be used as dependencies of libraries in the workspace (eg when compiling to
  bytecode and/or Javascript).  This is now fixed. (ocaml/dune#7151, @nojb)

- Allow the main module of a library with `(stdlib ...)` to depend on other
  libraries (ocaml/dune#7154, @anmonteiro).

- Bytecode executables built for JSOO are linked with `-noautolink` and no
  longer depend on the shared stubs of their dependent libraries (ocaml/dune#7156, @nojb)

- Added a new user action `(concurrent )` which is like `(progn )` but runs the
  actions concurrently. (ocaml/dune#6933, @Alizter)

- Allow `(stdlib ...)` to be used with `(wrapped false)` in library stanzas
  (ocaml/dune#7139, @anmonteiro).

- Allow parallel execution of inline tests partitions (ocaml/dune#7012, @hhugo)

- Support `(link_flags ...)` in `(cinaps ...)` stanza. (ocaml/dune#7423, fixes ocaml/dune#7416,
  @nojb)

- Allow `(package ...)` in any position within `(rule ...)` stanza (ocaml/dune#7445,
  @Leonidas-from-XIV)

- Always include `opam` files in the generated `.install` file. Previously, it
  would not be included whenever `(generate_opam_files true)` was set and the
  `.install` file wasn't yet generated. (ocaml/dune#7547, @rgrinberg)

- Fix regression where Merlin was unable to handle filenames with uppercase
  letters under Windows. (ocaml/dune#7577, @nojb)

- On nix+macos, pass `-f` to the codesign hook to avoid errors when the binary
  is already signed (ocaml/dune#7183, fixes ocaml/dune#6265, @greedy)

- Fix bug where RPC clients built with dune-rpc-lwt would crash when closing
  their connection to the server (ocaml/dune#7581, @gridbugs)

- Introduce mdx stanza 0.4 requiring mdx >= 2.3.0 which updates the default
  list of files to include `*.mld` files (ocaml/dune#7582, @Leonidas-from-XIV)

- Fix RPC server on Windows (used for OCaml-LSP). (ocaml/dune#7666, @nojb)

- Coq language versions less 0.8 are deprecated, and will be removed
  in an upcoming Dune version. All users are required to migrate to
  `(coq lang 0.8)` which provides the right semantics for theories
  that have been globally installed, such as those coming from opam
  (@ejgallego, @Alizter)

- Bump minimum version of the dune language for the melange syntax extension
  from 3.7 to 3.8 (ocaml/dune#7665, @jchavarri)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rgrinberg rgrinberg rgrinberg approved these changes

Assignees
No one assigned
Labels
cross-compilation
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Dune doesn't use ocamlfind config in default context
2 participants
@anmonteiro @rgrinberg