-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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
OCaml 5.0.0~beta1 release #22245
Merged
Merged
OCaml 5.0.0~beta1 release #22245
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
1 change: 1 addition & 0 deletions
1
...ges/ocaml-base-compiler/ocaml-base-compiler.5.0.0~beta1/files/ocaml-base-compiler.install
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| share_root: ["config.cache" {"ocaml/config.cache"}] |
47 changes: 47 additions & 0 deletions
47
packages/ocaml-base-compiler/ocaml-base-compiler.5.0.0~beta1/opam
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| opam-version: "2.0" | ||
| synopsis: "First beta release of OCaml 5.0.0" | ||
| maintainer: "[email protected]" | ||
| license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" | ||
| authors: "Xavier Leroy and many contributors" | ||
| homepage: "https://ocaml.org" | ||
| bug-reports: "https://github.com/ocaml/opam-repository/issues" | ||
| dev-repo: "git+https://github.com/ocaml/ocaml#5.0" | ||
| depends: [ | ||
| "ocaml" {= "5.0.0" & post} | ||
| "base-unix" {post} | ||
| "base-bigarray" {post} | ||
| "base-threads" {post} | ||
| "base-domains" {post} | ||
| "base-nnp" {post} | ||
| "ocaml-options-vanilla" {post} | ||
| "ocaml-beta" {opam-version < "2.1.0"} | ||
| ] | ||
| conflict-class: "ocaml-core-compiler" | ||
| flags: [ compiler avoid-version ] | ||
| setenv: CAML_LD_LIBRARY_PATH = "%{lib}%/stublibs" | ||
| build: [ | ||
| [ | ||
| "./configure" | ||
| "--prefix=%{prefix}%" | ||
| "--docdir=%{doc}%/ocaml" | ||
| "-C" | ||
| "CC=cc" {os = "openbsd" | os = "macos"} | ||
| "ASPP=cc -c" {os = "openbsd" | os = "macos"} | ||
| ] | ||
| [make "-j%{jobs}%"] | ||
| ] | ||
| install: [make "install"] | ||
| url { | ||
| src: "https://github.com/ocaml/ocaml/archive/5.0.0-beta1.tar.gz" | ||
| checksum: "sha256=75329f3cfcc4091cac8f35998ad946ecfc400d43f34119fb7c8b558d13e4633f" | ||
| } | ||
| extra-files: ["ocaml-base-compiler.install" "md5=3e969b841df1f51ca448e6e6295cb451"] | ||
| post-messages: [ | ||
| "A failure in the middle of the build may be caused by build parallelism | ||
| (enabled by default). | ||
| Please file a bug report at https://github.com/ocaml/opam-repository/issues" | ||
| {failure & jobs > 1} | ||
| "You can try installing again including --jobs=1 | ||
| to force a sequential build instead." | ||
| {failure & jobs > 1 & opam-version >= "2.0.5"} | ||
| ] |
1 change: 1 addition & 0 deletions
1
packages/ocaml-variants/ocaml-variants.5.0.0~beta1+options/files/ocaml-variants.install
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| share_root: ["config.cache" {"ocaml/config.cache"}] |
79 changes: 79 additions & 0 deletions
79
packages/ocaml-variants/ocaml-variants.5.0.0~beta1+options/opam
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| opam-version: "2.0" | ||
| license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" | ||
| synopsis: "First beta release of OCaml 5.0.0" | ||
| maintainer: "[email protected]" | ||
| authors: ["Xavier Leroy" "Damien Doligez" "Alain Frisch" "Jacques Garrigue" "Didier Rémy" "Jérôme Vouillon"] | ||
| homepage: "https://ocaml.org" | ||
| bug-reports: "https://github.com/ocaml/opam-repository/issues" | ||
| dev-repo: "git+https://github.com/ocaml/ocaml.git#5.0" | ||
| depends: [ | ||
| "ocaml" {= "5.0.0" & post} | ||
| "base-unix" {post} | ||
| "base-bigarray" {post} | ||
| "base-threads" {post} | ||
| "base-domains" {post} | ||
| "base-nnp" {post} | ||
| "ocaml-option-bytecode-only" {arch != "arm64" & arch != "x86_64"} | ||
| "ocaml-beta" {opam-version < "2.1.0"} | ||
| ] | ||
| conflict-class: "ocaml-core-compiler" | ||
| flags: [ compiler avoid-version ] | ||
| setenv: CAML_LD_LIBRARY_PATH = "%{lib}%/stublibs" | ||
| build: [ | ||
| [ | ||
| "./configure" | ||
| "--prefix=%{prefix}%" | ||
| "--docdir=%{doc}%/ocaml" | ||
| "-C" | ||
| "--with-afl" {ocaml-option-afl:installed} | ||
| "--disable-native-compiler" {ocaml-option-bytecode-only:installed} | ||
| "--disable-force-safe-string" {ocaml-option-default-unsafe-string:installed} | ||
| "DEFAULT_STRING=unsafe" {ocaml-option-default-unsafe-string:installed} | ||
| "--disable-flat-float-array" {ocaml-option-no-flat-float-array:installed} | ||
| "--enable-flambda" {ocaml-option-flambda:installed} | ||
| "--enable-frame-pointers" {ocaml-option-fp:installed} | ||
| "CC=cc" {!ocaml-option-32bit:installed & !ocaml-option-musl:installed & (os="openbsd"|os="macos")} | ||
| "CC=musl-gcc" {ocaml-option-musl:installed & os-distribution!="alpine"} | ||
| "CFLAGS=-Os" {ocaml-option-musl:installed} | ||
| "CC=gcc -m32" {ocaml-option-32bit:installed & os="linux"} | ||
| "CC=gcc -Wl,-read_only_relocs,suppress -arch i386 -m32" {ocaml-option-32bit:installed & os="macos"} | ||
| "ASPP=cc -c" {!ocaml-option-32bit:installed & !ocaml-option-musl:installed & (os="openbsd"|os="macos")} | ||
| "ASPP=musl-gcc -c" {ocaml-option-musl:installed & os-distribution!="alpine"} | ||
| "ASPP=gcc -m32 -c" {ocaml-option-32bit:installed & os="linux"} | ||
| "ASPP=gcc -arch i386 -m32 -c" {ocaml-option-32bit:installed & os="macos"} | ||
| "AS=as --32" {ocaml-option-32bit:installed & os="linux"} | ||
| "AS=as -arch i386" {ocaml-option-32bit:installed & os="macos"} | ||
| "--host=i386-linux" {ocaml-option-32bit:installed & os="linux"} | ||
| "--host=i386-apple-darwin13.2.0" {ocaml-option-32bit:installed & os="macos"} | ||
| "PARTIALLD=ld -r -melf_i386" {ocaml-option-32bit:installed & os="linux"} | ||
| "LIBS=-static" {ocaml-option-static:installed} | ||
| "--disable-warn-error" | ||
| ] | ||
| [make "-j%{jobs}%"] | ||
| ] | ||
| install: [make "install"] | ||
| url { | ||
| src: "https://github.com/ocaml/ocaml/archive/5.0.0-beta1.tar.gz" | ||
| checksum: "sha256=75329f3cfcc4091cac8f35998ad946ecfc400d43f34119fb7c8b558d13e4633f" | ||
| } | ||
| extra-files: ["ocaml-variants.install" "md5=3e969b841df1f51ca448e6e6295cb451"] | ||
| post-messages: [ | ||
| "A failure in the middle of the build may be caused by build parallelism | ||
| (enabled by default). | ||
| Please file a bug report at https://github.com/ocaml/opam-repository/issues" | ||
| {failure & jobs > 1} | ||
| "You can try installing again including --jobs=1 | ||
| to force a sequential build instead." | ||
| {failure & jobs > 1 & opam-version >= "2.0.5"} | ||
| ] | ||
| conflicts: [ "ocaml-option-fp" ] | ||
| depopts: [ | ||
| "ocaml-option-32bit" | ||
| "ocaml-option-afl" | ||
| "ocaml-option-bytecode-only" | ||
| "ocaml-option-default-unsafe-string" | ||
| "ocaml-option-no-flat-float-array" | ||
| "ocaml-option-flambda" | ||
| "ocaml-option-musl" | ||
| "ocaml-option-static" | ||
| ] | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if we're adding that, shouldn't there be a similar case for
ocaml-base-compiler?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That sounds reasonable: to me: the change originated from the 5.0.0+trunk opam package that was updated by @dra27 but I never imported the change to base-compiler package.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a good idea, but it will need the vanilla package to be tweaked. The
+optionspackage definitely needs it - I only didn't update the alpha packages in #21510 because of the unnecessary rebuild that would have triggered for existing switches.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we want to tweak the vanilla package now or should we wait for the next beta?