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

Try a new layout for compiler flags for OCaml 4.12.0 (and add 4.12.0~alpha1) #17541

Merged
merged 22 commits into from
Nov 16, 2020
Merged

Try a new layout for compiler flags for OCaml 4.12.0 (and add 4.12.0~alpha1) #17541

Show file tree
Hide file tree
Changes from 8 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 Oct 30, 2020
2e200d4
ocaml-options packages: add maintainer field
AltGr Nov 2, 2020
8a54959
Rename 'ocaml-options-*-only' to 'ocaml-options-only-*'
AltGr Nov 2, 2020
e215c2e
ocaml-variants: limit restriction to 'ocaml-beta' for opam 2.0
AltGr Nov 2, 2020
8f9d082
ocaml-variants trunk: skip config cache install
AltGr Nov 2, 2020
534193e
Re-add 'ocaml-base-compiler' as the choices for 'ocaml'
AltGr Nov 2, 2020
735a22a
Rename 'ocaml-variants.4.12.0' to '+options' to avoid confusion with …
AltGr Nov 3, 2020
1b05d09
Fix 4.12.0~alpha1 synopsis
AltGr Nov 5, 2020
df40a66
Fix stray 'ocaml-compiler'
AltGr Nov 9, 2020
82dfe31
Add the 'compiler' flag to ocaml-options packages
AltGr Nov 9, 2020
e69ffd5
Update ocaml-config
dra27 Nov 5, 2020
08a6a25
Add ocaml-base-compiler.4.12.0~alpha1
dra27 Nov 5, 2020
fcd7a0d
Fix ocaml-options-vanilla
AltGr Nov 9, 2020
86d7a2e
Remove custom ocaml ./configure for freebsd
AltGr Nov 9, 2020
1c10232
ocaml-config.2: handle backward-compat of the 'ocaml:compiler' variab…
AltGr Nov 10, 2020
b599bec
Spacetime is no longer available on 4.12
AltGr Nov 10, 2020
9453110
Rename 'ocaml-options-*' to 'ocaml-option-*'
AltGr Nov 12, 2020
b917702
Add more 'ocaml-options-only' packages
AltGr Nov 12, 2020
8f59243
Add ocaml-options-only-fp
AltGr Nov 12, 2020
4e8fc98
Apply suggestions from code review
AltGr Nov 12, 2020
00c540c
ocaml-config.2: Fix md5
kit-ty-kate Nov 16, 2020
7cc7d51
Make ocaml-base-compiler pull ocaml-options-vanilla
kit-ty-kate Nov 16, 2020
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
10 changes: 10 additions & 0 deletions packages/ocaml-options-32bit/ocaml-options-32bit.1/opam
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
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"
6 changes: 6 additions & 0 deletions packages/ocaml-options-afl/ocaml-options-afl.1/opam
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
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"
6 changes: 6 additions & 0 deletions packages/ocaml-options-bytecode-only/ocaml-options-bytecode-only.1/opam
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
opam-version: "2.0"
synopsis: "Compile OCaml without the native-code compiler"
depends: [
"ocaml-variants" {post & >= "4.12.0~"}
]
maintainer: "platform@lists.ocaml.org"
6 changes: 6 additions & 0 deletions packages/ocaml-options-default-unsafe-string/ocaml-options-default-unsafe-string.1/opam
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
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"
6 changes: 6 additions & 0 deletions packages/ocaml-options-flambda/ocaml-options-flambda.1/opam
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
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"
7 changes: 7 additions & 0 deletions packages/ocaml-options-fp/ocaml-options-fp.1/opam
View file
Open in desktop
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 frame-pointers enabled"
depends: [
"ocaml-variants" {post & >= "4.12.0~"}
]
conflicts: ["ocaml-options-musl"]
maintainer: "platform@lists.ocaml.org"
12 changes: 12 additions & 0 deletions packages/ocaml-options-musl/ocaml-options-musl.1/opam
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
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-options-32bit" ]
available: [ os = "openbsd" | os = "freebsd" | os = "macos" | os = "linux" ]
maintainer: "platform@lists.ocaml.org"
6 changes: 6 additions & 0 deletions packages/ocaml-options-nnp/ocaml-options-nnp.1/opam
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
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"
6 changes: 6 additions & 0 deletions packages/ocaml-options-no-flat-float-array/ocaml-options-no-flat-float-array.1/opam
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
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"
16 changes: 16 additions & 0 deletions packages/ocaml-options-only-flambda/ocaml-options-only-flambda.1/opam
View file
Open in desktop
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 activated, and no other custom options"
depends: ["ocaml-options-flambda"]
conflicts: [
"ocaml-options-32bit"
"ocaml-options-afl"
"ocaml-options-bytecode-only"
"ocaml-options-default-unsafe-string"
"ocaml-options-fp"
"ocaml-options-musl"
"ocaml-options-no-flat-float-array"
"ocaml-options-spacetime"
"ocaml-options-static"
"ocaml-options-nnp"
]
maintainer: "platform@lists.ocaml.org"
6 changes: 6 additions & 0 deletions packages/ocaml-options-spacetime/ocaml-options-spacetime.1/opam
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
opam-version: "2.0"
synopsis: "Set OCaml to be compiled with spacetime activated"
depends: [
"ocaml-variants" {post & >= "4.12.0~"}
]
maintainer: "platform@lists.ocaml.org"
14 changes: 14 additions & 0 deletions packages/ocaml-options-static/ocaml-options-static.1/opam
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
opam-version: "2.0"
synopsis: "Set OCaml to be compiled with musl-gcc -static"
depends: [
"ocaml-options-musl"
"ocaml-variants" {post & >= "4.12.0~"}
]
depexts: [
["musl-tools"] {os-family = "debian"}
["musl"] {os-distribution = "arch"}
["musl-dev"] {os-distribution = "alpine"}
]
conflicts: [ "ocaml-options-32bit" ]
available: [ os = "openbsd" | os = "freebsd" | os = "macos" | os = "linux" ]
maintainer: "platform@lists.ocaml.org"
17 changes: 17 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
@@ -0,0 +1,17 @@
opam-version: "2.0"
synopsis: "Ensure that OCaml is compiled with no special options enabled"
conflicts: [
"ocaml-variants" {< "4.12.0~"}
"ocaml-options-32bit"
"ocaml-options-afl"
"ocaml-options-bytecode-only"
"ocaml-options-default-unsafe-string"
"ocaml-options-flambda"
"ocaml-options-fp"
"ocaml-options-musl"
"ocaml-options-no-flat-float-array"
"ocaml-options-spacetime"
"ocaml-options-static"
"ocaml-options-nnp"
]
maintainer: "platform@lists.ocaml.org"
38 changes: 0 additions & 38 deletions packages/ocaml-variants/ocaml-variants.4.12.0+trunk+afl/opam
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions packages/ocaml-variants/ocaml-variants.4.12.0+trunk+flambda/opam
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions packages/ocaml-variants/ocaml-variants.4.12.0+trunk+fp+flambda/opam
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions packages/ocaml-variants/ocaml-variants.4.12.0+trunk+fp/opam
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions packages/ocaml-variants/ocaml-variants.4.12.0+trunk+nnp/opam
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions packages/ocaml-variants/ocaml-variants.4.12.0+trunk+no-flat-float-array/opam
View file
Open in desktop

This file was deleted.

Loading