-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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
Try a new layout for compiler flags for OCaml 4.12.0 (and add 4.12.0~alpha1) #17541
Merged
Merged
Changes from 20 commits
Commits
Show all changes
22 commits
Select commit
Hold shift + click to select a range
ae22a4a
Try a new layout for compiler flags for OCaml 4.12.0
AltGr 2e200d4
ocaml-options packages: add maintainer field
AltGr 8a54959
Rename 'ocaml-options-*-only' to 'ocaml-options-only-*'
AltGr e215c2e
ocaml-variants: limit restriction to 'ocaml-beta' for opam 2.0
AltGr 8f9d082
ocaml-variants trunk: skip config cache install
AltGr 534193e
Re-add 'ocaml-base-compiler' as the choices for 'ocaml'
AltGr 735a22a
Rename 'ocaml-variants.4.12.0' to '+options' to avoid confusion with …
AltGr 1b05d09
Fix 4.12.0~alpha1 synopsis
AltGr df40a66
Fix stray 'ocaml-compiler'
AltGr 82dfe31
Add the 'compiler' flag to ocaml-options packages
AltGr e69ffd5
Update ocaml-config
dra27 08a6a25
Add ocaml-base-compiler.4.12.0~alpha1
dra27 fcd7a0d
Fix ocaml-options-vanilla
AltGr 86d7a2e
Remove custom ocaml ./configure for freebsd
AltGr 1c10232
ocaml-config.2: handle backward-compat of the 'ocaml:compiler' variab…
AltGr b599bec
Spacetime is no longer available on 4.12
AltGr 9453110
Rename 'ocaml-options-*' to 'ocaml-option-*'
AltGr b917702
Add more 'ocaml-options-only' packages
AltGr 8f59243
Add ocaml-options-only-fp
AltGr 4e8fc98
Apply suggestions from code review
AltGr 00c540c
ocaml-config.2: Fix md5
kit-ty-kate 7cc7d51
Make ocaml-base-compiler pull ocaml-options-vanilla
kit-ty-kate 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
...s/ocaml-base-compiler/ocaml-base-compiler.4.12.0~alpha1/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"}] |
19 changes: 12 additions & 7 deletions
19
...ants/ocaml-variants.4.12.0+trunk+afl/opam → ...er/ocaml-base-compiler.4.12.0~alpha1/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
56 changes: 56 additions & 0 deletions
56
packages/ocaml-config/ocaml-config.2/files/gen_ocaml_config.ml.in
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,56 @@ | ||
| let () = | ||
| let ocaml_version = | ||
| let v = Sys.ocaml_version in | ||
| let l = String.length v in | ||
| let plus = try String.index v '+' with Not_found -> l in | ||
| (* Introduced in 4.11.0; used from 4.12.0 *) | ||
| let tilde = try String.index v '~' with Not_found -> l in | ||
| String.sub v 0 (min (min plus tilde) l) | ||
| in | ||
| if ocaml_version <> Sys.argv.(1) then | ||
| (Printf.eprintf | ||
| "OCaml version mismatch: %%s, expected %s" | ||
| ocaml_version Sys.argv.(1); | ||
| exit 1) | ||
| else | ||
| let oc = open_out (Sys.argv.(2) ^ ".config") in | ||
| let exe = ".exe" in | ||
| let (ocaml, suffix) = | ||
| let s = Sys.executable_name in | ||
| if Filename.check_suffix s exe then | ||
| (Filename.chop_suffix s exe, exe) | ||
| else | ||
| (s, "") | ||
| in | ||
| let ocamlc = ocaml^"c"^suffix in | ||
| let libdir = | ||
| if Sys.command (ocamlc^" -where > where") = 0 then | ||
| (* Must be opened in text mode for Windows *) | ||
| let ic = open_in "where" in | ||
| let r = input_line ic in | ||
| close_in ic; r | ||
| else | ||
| failwith "Bad return from 'ocamlc -where'" | ||
| in | ||
| let stubsdir = | ||
| let ic = open_in (Filename.concat libdir "ld.conf") in | ||
| let rec r acc = try r (input_line ic::acc) with End_of_file -> acc in | ||
| let lines = List.rev (r []) in | ||
| close_in ic; | ||
| String.concat ":" lines | ||
| in | ||
| let p fmt = Printf.fprintf oc (fmt ^^ "\n") in | ||
| p "opam-version: \"2.0\""; | ||
| p "variables {"; | ||
| p " native: %%b" | ||
| (Sys.file_exists (ocaml^"opt"^suffix)); | ||
| p " native-tools: %%b" | ||
| (Sys.file_exists (ocamlc^".opt"^suffix)); | ||
| p " native-dynlink: %%b" | ||
| (Sys.file_exists (Filename.concat libdir "dynlink.cmxa")); | ||
| p " stubsdir: %%S" | ||
| stubsdir; | ||
| p " preinstalled: %{ocaml-system:installed}%"; | ||
| p " compiler: \"%{ocaml-system:installed?system:}%%{ocaml-base-compiler:version}%%{ocaml-variants:version}%%{ocaml-option-32bit:installed?+32bit:}%%{ocaml-option-afl:installed?+afl:}%%{ocaml-option-bytecode-only:installed?+bytecode-only:}%%{ocaml-option-default-unsafe-string:installed?+default-unsafe-string:}%%{ocaml-option-fp:installed?+fp:}%%{ocaml-option-flambda:installed?+flambda:}%%{ocaml-option-musl:installed?+musl:}%%{ocaml-option-nnp:installed?+nnp:}%%{ocaml-option-no-flat-float-array:installed?+no-flat-float-array:}%%{ocaml-option-spacetime:installed?+spacetime:}%%{ocaml-option-static:installed?+static:}%\""; | ||
| p "}"; | ||
| close_out oc |
1 change: 1 addition & 0 deletions
1
packages/ocaml-config/ocaml-config.2/files/ocaml-config.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: ["gen_ocaml_config.ml"] |
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,21 @@ | ||
| opam-version: "2.0" | ||
| synopsis: "OCaml Switch Configuration" | ||
| description: """ | ||
| This package is used by the OCaml package to set-up its variables.""" | ||
| maintainer: "platform@lists.ocaml.org" | ||
| authors: [ | ||
| "Louis Gesbert <louis.gesbert@ocamlpro.com>" | ||
| "David Allsopp <david.allsopp@metastack.com>" | ||
| ] | ||
| homepage: "https://opam.ocaml.org/" | ||
| bug-reports: "https://github.com/ocaml/opam/issues" | ||
| depends: [ | ||
| "ocaml-base-compiler" {>= "4.12.0~"} | | ||
| "ocaml-variants" {>= "4.12.0~"} | | ||
| "ocaml-system" {>= "4.12.0~"} | ||
| ] | ||
| substs: "gen_ocaml_config.ml" | ||
| extra-files: [ | ||
| ["gen_ocaml_config.ml.in" "md5=07afb6231bbcf399f7f7872e25eb23a1"] | ||
kit-ty-kate marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| ["ocaml-config.install" "md5=8e50c5e2517d3463b3aad649748cafd7"] | ||
| ] | ||
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,11 @@ | ||
| opam-version: "2.0" | ||
| synopsis: "Set OCaml to be compiled in 32-bit mode for 64-bit Linux and OS X hosts" | ||
| depexts: [ | ||
| ["gcc-multilib" "g++-multilib"] {os-family = "debian"} | ||
| ] | ||
| depends: [ | ||
| "ocaml-variants" {post & >= "4.12.0~"} | ||
| ] | ||
| available: [ arch = "x86_64" & (os = "linux" | os = "macos") ] | ||
| maintainer: "platform@lists.ocaml.org" | ||
| flags: compiler |
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,7 @@ | ||
| opam-version: "2.0" | ||
| synopsis: "Set OCaml to be compiled with afl-fuzz instrumentation" | ||
| depends: [ | ||
| "ocaml-variants" {post & >= "4.12.0~"} | ||
| ] | ||
| maintainer: "platform@lists.ocaml.org" | ||
| flags: compiler |
7 changes: 7 additions & 0 deletions
7
packages/ocaml-option-bytecode-only/ocaml-option-bytecode-only.1/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,7 @@ | ||
| opam-version: "2.0" | ||
| synopsis: "Compile OCaml without the native-code compiler" | ||
| depends: [ | ||
| "ocaml-variants" {post & >= "4.12.0~"} | ||
| ] | ||
| maintainer: "platform@lists.ocaml.org" | ||
| flags: compiler |
7 changes: 7 additions & 0 deletions
7
packages/ocaml-option-default-unsafe-string/ocaml-option-default-unsafe-string.1/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,7 @@ | ||
| opam-version: "2.0" | ||
| synopsis: "Set OCaml to be compiled without safe strings by default" | ||
| depends: [ | ||
| "ocaml-variants" {post & >= "4.12.0~"} | ||
| ] | ||
| maintainer: "platform@lists.ocaml.org" | ||
| flags: compiler |
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,7 @@ | ||
| opam-version: "2.0" | ||
| synopsis: "Set OCaml to be compiled with flambda activated" | ||
| depends: [ | ||
| "ocaml-variants" {post & >= "4.12.0~"} | ||
| ] | ||
| maintainer: "platform@lists.ocaml.org" | ||
| flags: compiler |
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,8 @@ | ||
| opam-version: "2.0" | ||
| synopsis: "Set OCaml to be compiled with frame-pointers enabled" | ||
| depends: [ | ||
| "ocaml-variants" {post & >= "4.12.0~"} | ||
| ] | ||
| conflicts: ["ocaml-option-musl"] | ||
| maintainer: "platform@lists.ocaml.org" | ||
| flags: compiler |
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,13 @@ | ||
| opam-version: "2.0" | ||
| synopsis: "Set OCaml to be compiled with musl-gcc" | ||
| depends: [ | ||
| "ocaml-variants" {post & >= "4.12.0~"} | ||
| ] | ||
| depexts: [ | ||
| ["musl-tools"] {os-family = "debian"} | ||
| ["musl"] {os-distribution = "arch"} | ||
| ] | ||
| conflicts: [ "ocaml-option-32bit" ] | ||
| available: [ os = "openbsd" | os = "freebsd" | os = "macos" | os = "linux" ] | ||
| maintainer: "platform@lists.ocaml.org" | ||
| flags: compiler |
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,7 @@ | ||
| opam-version: "2.0" | ||
| synopsis: "Set OCaml to be compiled with --disable-naked-pointers" | ||
| depends: [ | ||
| "ocaml-variants" {post & >= "4.12.0~"} | ||
| ] | ||
| maintainer: "platform@lists.ocaml.org" | ||
| flags: compiler |
7 changes: 7 additions & 0 deletions
7
packages/ocaml-option-no-flat-float-array/ocaml-option-no-flat-float-array.1/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,7 @@ | ||
| opam-version: "2.0" | ||
| synopsis: "Set OCaml to be compiled with --disable-flat-float-array" | ||
| depends: [ | ||
| "ocaml-variants" {post & >= "4.12.0~"} | ||
| ] | ||
| maintainer: "platform@lists.ocaml.org" | ||
| flags: compiler |
8 changes: 8 additions & 0 deletions
8
packages/ocaml-option-spacetime/ocaml-option-spacetime.1/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,8 @@ | ||
| opam-version: "2.0" | ||
| synopsis: "Set OCaml to be compiled with spacetime activated" | ||
| depends: [ | ||
| # Not available until options are ported to earlier compilers | ||
| "ocaml-variants" {post & >= "4.12.0~" & < "4.12"} | ||
dra27 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| ] | ||
| maintainer: "platform@lists.ocaml.org" | ||
| flags: compiler | ||
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,15 @@ | ||
| opam-version: "2.0" | ||
| synopsis: "Set OCaml to be compiled with musl-gcc -static" | ||
| depends: [ | ||
| "ocaml-option-musl" | ||
| "ocaml-variants" {post & >= "4.12.0~"} | ||
| ] | ||
| depexts: [ | ||
| ["musl-tools"] {os-family = "debian"} | ||
| ["musl"] {os-distribution = "arch"} | ||
| ["musl-dev"] {os-distribution = "alpine"} | ||
| ] | ||
| conflicts: [ "ocaml-option-32bit" ] | ||
| available: [ os = "openbsd" | os = "freebsd" | os = "macos" | os = "linux" ] | ||
| maintainer: "platform@lists.ocaml.org" | ||
| flags: compiler |
17 changes: 17 additions & 0 deletions
17
packages/ocaml-options-only-afl/ocaml-options-only-afl.1/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,17 @@ | ||
| opam-version: "2.0" | ||
| synopsis: "Ensure that OCaml is compiled with AFL support enabled, and no other custom options" | ||
| depends: ["ocaml-option-afl"] | ||
| conflicts: [ | ||
| "ocaml-option-32bit" | ||
| "ocaml-option-bytecode-only" | ||
| "ocaml-option-default-unsafe-string" | ||
| "ocaml-option-flambda" | ||
| "ocaml-option-fp" | ||
| "ocaml-option-musl" | ||
| "ocaml-option-no-flat-float-array" | ||
| "ocaml-option-spacetime" | ||
| "ocaml-option-static" | ||
| "ocaml-option-nnp" | ||
| ] | ||
| maintainer: "platform@lists.ocaml.org" | ||
| flags: compiler |
16 changes: 16 additions & 0 deletions
16
packages/ocaml-options-only-flambda-fp/ocaml-options-only-flambda-fp.1/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,16 @@ | ||
| opam-version: "2.0" | ||
| synopsis: "Ensure that OCaml is compiled with flambda and frame-pointer enabled, and no other custom options" | ||
| depends: ["ocaml-option-flambda" "ocaml-option-fp"] | ||
| conflicts: [ | ||
| "ocaml-option-32bit" | ||
| "ocaml-option-afl" | ||
| "ocaml-option-bytecode-only" | ||
| "ocaml-option-default-unsafe-string" | ||
| "ocaml-option-musl" | ||
| "ocaml-option-no-flat-float-array" | ||
| "ocaml-option-spacetime" | ||
| "ocaml-option-static" | ||
| "ocaml-option-nnp" | ||
| ] | ||
| maintainer: "platform@lists.ocaml.org" | ||
| flags: compiler |
17 changes: 17 additions & 0 deletions
17
packages/ocaml-options-only-flambda/ocaml-options-only-flambda.1/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,17 @@ | ||
| opam-version: "2.0" | ||
| synopsis: "Ensure that OCaml is compiled with flambda activated, and no other custom options" | ||
| depends: ["ocaml-option-flambda"] | ||
| conflicts: [ | ||
| "ocaml-option-32bit" | ||
| "ocaml-option-afl" | ||
| "ocaml-option-bytecode-only" | ||
| "ocaml-option-default-unsafe-string" | ||
| "ocaml-option-fp" | ||
| "ocaml-option-musl" | ||
| "ocaml-option-no-flat-float-array" | ||
| "ocaml-option-spacetime" | ||
| "ocaml-option-static" | ||
| "ocaml-option-nnp" | ||
| ] | ||
| maintainer: "platform@lists.ocaml.org" | ||
| flags: compiler |
17 changes: 17 additions & 0 deletions
17
packages/ocaml-options-only-fp/ocaml-options-only-fp.1/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,17 @@ | ||
| opam-version: "2.0" | ||
| synopsis: "Ensure that OCaml is compiled with only frame-pointer enabled, and no other custom options" | ||
| depends: ["ocaml-option-fp"] | ||
| conflicts: [ | ||
| "ocaml-option-32bit" | ||
| "ocaml-option-afl" | ||
| "ocaml-option-bytecode-only" | ||
| "ocaml-option-default-unsafe-string" | ||
| "ocaml-option-flambda" | ||
| "ocaml-option-musl" | ||
| "ocaml-option-no-flat-float-array" | ||
| "ocaml-option-spacetime" | ||
| "ocaml-option-static" | ||
| "ocaml-option-nnp" | ||
| ] | ||
| maintainer: "platform@lists.ocaml.org" | ||
| flags: compiler |
17 changes: 17 additions & 0 deletions
17
packages/ocaml-options-only-nnp/ocaml-options-only-nnp.1/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,17 @@ | ||
| opam-version: "2.0" | ||
| synopsis: "Ensure that OCaml is compiled with no-naked-pointers, and no other custom options" | ||
| depends: ["ocaml-option-nnp"] | ||
| conflicts: [ | ||
| "ocaml-option-32bit" | ||
| "ocaml-option-afl" | ||
| "ocaml-option-bytecode-only" | ||
| "ocaml-option-default-unsafe-string" | ||
| "ocaml-option-flambda" | ||
| "ocaml-option-fp" | ||
| "ocaml-option-musl" | ||
| "ocaml-option-no-flat-float-array" | ||
| "ocaml-option-spacetime" | ||
| "ocaml-option-static" | ||
| ] | ||
| maintainer: "platform@lists.ocaml.org" | ||
| flags: compiler |
17 changes: 17 additions & 0 deletions
17
...ages/ocaml-options-only-no-flat-float-array/ocaml-options-only-no-flat-float-array.1/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,17 @@ | ||
| opam-version: "2.0" | ||
| synopsis: "Ensure that OCaml is compiled with no-flat-float-array, and no other custom options" | ||
| depends: ["ocaml-option-no-flat-float-array"] | ||
| conflicts: [ | ||
| "ocaml-option-32bit" | ||
| "ocaml-option-afl" | ||
| "ocaml-option-bytecode-only" | ||
| "ocaml-option-default-unsafe-string" | ||
| "ocaml-option-flambda" | ||
| "ocaml-option-fp" | ||
| "ocaml-option-musl" | ||
| "ocaml-option-spacetime" | ||
| "ocaml-option-static" | ||
| "ocaml-option-nnp" | ||
| ] | ||
| maintainer: "platform@lists.ocaml.org" | ||
| flags: compiler |
22 changes: 22 additions & 0 deletions
22
packages/ocaml-options-vanilla/ocaml-options-vanilla.1/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,22 @@ | ||
| opam-version: "2.0" | ||
| synopsis: "Ensure that OCaml is compiled with no special options enabled" | ||
| depends: [ | ||
| "ocaml-base-compiler" {post} | | ||
| "ocaml-system" {post} | | ||
| "ocaml-variants" {post & >= "4.12.0~"} | ||
| ] | ||
| conflicts: [ | ||
| "ocaml-option-32bit" | ||
| "ocaml-option-afl" | ||
| "ocaml-option-bytecode-only" | ||
| "ocaml-option-default-unsafe-string" | ||
| "ocaml-option-flambda" | ||
| "ocaml-option-fp" | ||
| "ocaml-option-musl" | ||
| "ocaml-option-no-flat-float-array" | ||
| "ocaml-option-spacetime" | ||
| "ocaml-option-static" | ||
| "ocaml-option-nnp" | ||
| ] | ||
| maintainer: "platform@lists.ocaml.org" | ||
| flags: compiler |
Oops, something went wrong.
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.
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.
Note it's remained
ocaml-options-vanilla(in plural) - so you depend on "vanilla options" (i.e. no options) rather than "the vanilla option" (which, alas, OCaml does not in fact have 🍦)I think this is already achieved, though, because of the conflict-class, which prevents ocaml-base-compiler switching to ocaml-variants already, @AltGr?
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.
Oh, do we want to move the remaining
ocaml-options-*to their singular counterparts before that? I think it's a bit confusing and potential source of errors to have both.Apart from that, the request itself isn't a blocker, it's more for the sake of completeness. I don't care about it that much.
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.
Ah yes, indeed, in the case of
ocaml-base-compiler, we have two options:ocaml-base-compilerbe just an alias forocaml-variants.x+options&ocaml-options-vanillabase-compilerby the version with options, not needing thevariants.x+optionsat all. Not right away though)The two should be equivalent in what you will get in the resulting switch ; my first take was option 1 here, to avoid duplication of the build instruction, but after some thought we decided to be more conservative and keep the stand-alone definition: it's less disruptive to current users of
ocaml-base-compiler.@dra27 yes,
ocaml-variantsandocaml-base-compilerare mutually exclusive as before, and all options requirevariantsso this is not needed; I guess @kit-ty-kate wanted the presence ofoptions-vanillato be a reliable marker that you are on the vanilla case; since theocaml-options-vanillapackage has already been made compatible withocaml-base-compiler, there would be no harm in adding this dependency here to that purpose I guess.