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

Fix interpretation of / in META files #1889

Merged
1 commit merged into from Feb 27, 2019
Merged

Fix interpretation of / in META files #1889

1 commit merged into from Feb 27, 2019

Conversation

ghost
Copy link

@ghost ghost commented Feb 27, 2019

Fixes #1885

@ghost
Copy link
Author

ghost commented Feb 27, 2019

I checked manually that it fixes the issue.

src/dune_package.ml Outdated Show resolved Hide resolved
@jberdine
Copy link
Contributor

Thanks! I've pinned this PR and tested locally: problem solved.

CHANGES.md Outdated
------------------

- Fix interpretation of `META` files containing archives with `/` in
the filename. This was causing llvm to be unusable with dune (#1889,
Copy link
Contributor

Choose a reason for hiding this comment

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

It might be more helpful to people reading the changelog if a less specific description was given. I don't think that llvm is so special, wouldn't the same issue arise for any lib with sublibs?

Copy link
Author

Choose a reason for hiding this comment

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

Before dune, all sublibs were usually installed in the main directory since that was the easiest thing to do. Sublibs installed in subdirs generally have a directory field (that's what dune does for instance) and since filenames are relative to that directory, filenames still don't contain slashes.

So llvm is probably one of a very small set of projects to be affected, so it seems worth mentioning to me. I added "for instance" to make it clear it's just an example

Copy link
Contributor

Choose a reason for hiding this comment

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

I see, thanks for the explanation. (Maybe there is too much flexibility somewhere...)

@ghost ghost merged commit dd7425a into ocaml:master Feb 27, 2019
rgrinberg pushed a commit that referenced this pull request Feb 27, 2019
rgrinberg added a commit to rgrinberg/opam-repository that referenced this pull request Feb 27, 2019
CHANGES:

- Fix interpretation of `META` files containing archives with `/` in
  the filename. For instance, this was causing llvm to be unusable
  with dune (ocaml/dune#1889, fix ocaml/dune#1885, @diml)

- Make errors about menhir stanzas be located (ocaml/dune#1881, fix ocaml/dune#1876,
  @diml)
This pull request was closed.
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