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

Fix ocaml-base-compiler.5.0.0~beta1 on bytecode-only architectures #22246

Merged
merged 1 commit into from
Oct 17, 2022
Merged

Fix ocaml-base-compiler.5.0.0~beta1 on bytecode-only architectures #22246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/ocaml-option-bytecode-only/ocaml-option-bytecode-only.1/opam
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
opam-version: "2.0"
synopsis: "Compile OCaml without the native-code compiler"
depends: [
"ocaml-variants" {post & >= "4.12.0~"}
"ocaml-variants" {post & >= "4.12.0~"} |
"ocaml-base-compiler" {post & >= "5.0.0~~" & arch != "arm64" & arch != "x86_64"}
]
conflicts: [ "ocaml-option-afl" "ocaml-option-fp" "ocaml-option-flambda" ]
maintainer: "platform@lists.ocaml.org"
Expand Down
5 changes: 5 additions & 0 deletions packages/ocaml-options-vanilla/ocaml-options-vanilla.1/opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ conflicts: [
"ocaml-option-32bit"
"ocaml-option-afl"
"ocaml-option-bytecode-only"
{ocaml-system:version < "5" |
ocaml-base-compiler:version < "5" |
ocaml-variants:version < "5" |
arch = "arm64" |
arch = "x86_64" }
Copy link
Member

Choose a reason for hiding this comment

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

😭 this is going to make everyone rebuild all of their switches if they have opam < 2.2 😭

Copy link
Member

Choose a reason for hiding this comment

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

Doesn't that mean that every new supported architecture on OCaml 5 will trigger such a rebuild ?

Copy link
Member

Choose a reason for hiding this comment

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

yes, any change in the depends field with opam < 2.2 triggers a rebuild

Copy link
Member

Choose a reason for hiding this comment

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

ah it looks like since these are post dependencies it might be fine in the end. From quick testing:

  • opam 2.0 does not do anything
  • opam 2.1 does reinstall just ocaml-options-vanilla
  • opam 2.2 does nothing

But i suppose it requires more testing to be sure

"ocaml-option-default-unsafe-string"
"ocaml-option-flambda"
"ocaml-option-fp"
Expand Down