Skip to content

Commit 11bdbee

Browse files
mserimseri
authored
Merge pull request #26909 from Octachron/ocaml-5.2.1
Release of OCaml 5.2.1
2 parents 9f59ecb + 82be106 commit 11bdbee

File tree

6 files changed

+463
-111
lines changed
  • packages
    • ocaml-base-compiler/ocaml-base-compiler.5.2.1
    • ocaml-system/ocaml-system.5.2.1
    • ocaml-variants
      • ocaml-variants.5.2.1+options
      • ocaml-variants.5.2.1+trunk
      • ocaml-variants.5.2.2+trunk
    • ocaml/ocaml.5.2.2

6 files changed

+463
-111
lines changed

‎packages/ocaml-base-compiler/ocaml-base-compiler.5.2.1/opam

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
opam-version: "2.0"
2+
synopsis: "Official release 5.2.1"
3+
maintainer: [
4+
"David Allsopp <[email protected]>"
5+
"Florian Angeletti <[email protected]>"
6+
]
7+
license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception"
8+
authors: "Xavier Leroy and many contributors"
9+
homepage: "https://ocaml.org"
10+
bug-reports: "https://github.com/ocaml/opam-repository/issues"
11+
dev-repo: "git+https://github.com/ocaml/ocaml#5.2"
12+
depends: [
13+
# This is OCaml 5.2.1
14+
"ocaml" {= "5.2.1" & post}
15+
16+
# General base- packages
17+
"base-unix" {post}
18+
"base-bigarray" {post}
19+
"base-threads" {post}
20+
"base-domains" {post}
21+
"base-nnp" {post}
22+
23+
# Architecture (non-Windows)
24+
# opam-repository at present requires that ocaml-base-compiler is installed
25+
# using an architecture which matches the machine's, since arch is used in
26+
# available fields. Cross-compilation at this stage is an unstable accident.
27+
"host-arch-arm32" {arch = "arm32" & post}
28+
"host-arch-arm64" {arch = "arm64" & post}
29+
"host-arch-ppc64" {arch = "ppc64" & post}
30+
"host-arch-riscv64" {arch = "riscv64" & post}
31+
"host-arch-s390x" {arch = "s390x" & post}
32+
# The Windows ports explicitly select the architecture (see below) this
33+
# facility is not yet available for other platforms.
34+
"host-arch-x86_32" {os != "win32" & arch = "x86_32" & post}
35+
"host-arch-x86_64" {os != "win32" & arch = "x86_64" & post}
36+
"host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post}
37+
38+
# Port selection (Windows)
39+
# amd64 mingw-w64 only
40+
(("arch-x86_64" {os = "win32" & arch = "x86_64"} &
41+
"system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & build}) |
42+
# i686 mingw-w64 only
43+
("arch-x86_32" {os = "win32"} & "ocaml-option-bytecode-only" &
44+
"system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & build}) |
45+
# Non-Windows systems
46+
"host-system-other" {os != "win32" & post})
47+
48+
# OCaml with default configuration (no flambda, TSAN, etc.)
49+
"ocaml-options-vanilla" {post}
50+
"ocaml-option-bytecode-only" {arch != "arm64" & arch != "x86_64" & arch != "s390x" & arch != "riscv64" & arch != "ppc64"}
51+
52+
# Support Packages
53+
"flexdll" {>= "0.42" & os = "win32"}
54+
]
55+
conflicts: "system-msvc"
56+
conflict-class: "ocaml-core-compiler"
57+
flags: compiler
58+
setenv: CAML_LD_LIBRARY_PATH = "%{lib}%/stublibs"
59+
x-env-path-rewrite: [
60+
[CAML_LD_LIBRARY_PATH (";" {os = "win32"} ":" {os != "win32"}) "target"]
61+
]
62+
build: [
63+
[
64+
"./configure"
65+
"--host=x86_64-w64-mingw32" {os-distribution = "cygwin" & system-mingw:installed & arch-x86_64:installed}
66+
"--host=i686-w64-mingw32" {os-distribution = "cygwin" & system-mingw:installed & arch-x86_32:installed}
67+
"--prefix=%{prefix}%"
68+
"--docdir=%{doc}%/ocaml"
69+
"--with-flexdll=%{flexdll:share}%" {os = "win32" & flexdll:installed}
70+
"-C"
71+
"CC=cc" {os = "openbsd" | os = "macos"}
72+
"ASPP=cc -c" {os = "openbsd" | os = "macos"}
73+
]
74+
[make "-j%{jobs}%"]
75+
]
76+
install: [make "install"]
77+
url {
78+
src: "https://github.com/ocaml/ocaml/releases/download/5.2.1/ocaml-5.2.1.tar.gz"
79+
checksum: "sha256=2d0f8090951a97a2c0e5b8a11e90096c0e1791d2e471e4a67f87e3b974044cd0"
80+
}
81+
extra-source "ocaml-base-compiler.install" {
82+
src:
83+
"https://raw.githubusercontent.com/ocaml/opam-source-archives/main/patches/ocaml-base-compiler/ocaml-base-compiler.install"
84+
checksum: [
85+
"sha256=79f2a1a5044a91350a0eb6ce12e261a72a2855c094c425cddf3860e58c486678"
86+
"md5=3e969b841df1f51ca448e6e6295cb451"
87+
]
88+
}

‎packages/ocaml-system/ocaml-system.5.2.1/opam

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
opam-version: "2.0"
2+
synopsis: "The OCaml compiler (system version, from outside of opam)"
3+
maintainer: [
4+
"David Allsopp <[email protected]>"
5+
"Florian Angeletti <[email protected]>"
6+
]
7+
license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception"
8+
authors: "Xavier Leroy and many contributors"
9+
homepage: "https://ocaml.org"
10+
bug-reports: "https://github.com/ocaml/opam-repository/issues"
11+
dev-repo: "git+https://github.com/ocaml/ocaml"
12+
depends: [
13+
# This is OCaml 5.2.1
14+
"ocaml" {= "5.2.1" & post}
15+
16+
# General base- packages
17+
"base-unix" {post}
18+
"base-threads" {post}
19+
"base-bigarray" {post}
20+
"base-domains" {post}
21+
"base-nnp" {post}
22+
23+
# Architecture
24+
"host-arch-arm32" {?sys-ocaml-arch & sys-ocaml-arch = "arm" & post}
25+
"host-arch-arm64" {?sys-ocaml-arch & sys-ocaml-arch = "arm64" & post}
26+
"host-arch-ppc64" {?sys-ocaml-arch & sys-ocaml-arch = "power" & post}
27+
"host-arch-riscv64" {?sys-ocaml-arch & sys-ocaml-arch = "riscv" & post}
28+
"host-arch-s390x" {?sys-ocaml-arch & sys-ocaml-arch = "s390x" & post}
29+
"host-arch-x86_32" {?sys-ocaml-arch & sys-ocaml-arch = "i686" & post}
30+
"host-arch-x86_64" {?sys-ocaml-arch & sys-ocaml-arch = "x86_64" & post}
31+
"host-arch-unknown" {!(?sys-ocaml-arch) |
32+
sys-ocaml-arch != "arm" &
33+
sys-ocaml-arch != "arm64" &
34+
sys-ocaml-arch != "power" &
35+
sys-ocaml-arch != "riscv" &
36+
sys-ocaml-arch != "s390x" &
37+
sys-ocaml-arch != "i686" &
38+
sys-ocaml-arch != "x86_64" & post}
39+
40+
# System (Windows-only at present)
41+
"host-system-mingw" {?sys-ocaml-arch & sys-ocaml-libc = "msvc" & sys-ocaml-cc = "cc" & post}
42+
# There is no official MSVC support for 5.2.1
43+
"host-system-msvc" {?sys-ocaml-arch & sys-ocaml-cc = "msvc" & post}
44+
"host-system-other" {?sys-ocaml-arch & sys-ocaml-libc != "msvc" & post}
45+
46+
# Environment configuration (Windows-only)
47+
# NB There are not "system" distributions of OCaml on Windows; the support
48+
# here is intended for binary caching setups, choosing to install a build
49+
# of OCaml external to opam, but still using opam to provide the C compiler
50+
# configuration.
51+
"conf-mingw-w64-gcc-x86_64" {?sys-ocaml-arch & sys-ocaml-arch = "x86_64" & sys-ocaml-libc = "msvc" & sys-ocaml-cc = "cc" & post}
52+
"conf-mingw-w64-gcc-i686" {?sys-ocaml-arch & sys-ocaml-arch = "i686" & sys-ocaml-libc = "msvc" & sys-ocaml-cc = "cc" & post}
53+
"conf-mingw-w64-zstd-x86_64" {?sys-ocaml-arch & sys-ocaml-arch = "x86_64" & sys-ocaml-libc = "msvc" & sys-ocaml-cc = "cc" & post}
54+
"conf-mingw-w64-zstd-i686" {?sys-ocaml-arch & sys-ocaml-arch = "i686" & sys-ocaml-libc = "msvc" & sys-ocaml-cc = "cc" & post}
55+
"mingw-w64-shims" {?sys-ocaml-arch & sys-ocaml-libc = "msvc" & sys-ocaml-cc = "cc" & os-distribution = "cygwin" & post}
56+
"ocaml-env-msvc32" {?sys-ocaml-arch & sys-ocaml-arch = "i686" & sys-ocaml-cc = "msvc" & post}
57+
"ocaml-env-msvc64" {?sys-ocaml-arch & sys-ocaml-arch = "x86_64" & sys-ocaml-cc = "msvc" & post}
58+
]
59+
conflict-class: "ocaml-core-compiler"
60+
available: sys-ocaml-version = "5.2.1" & (os != "win32" | sys-ocaml-libc = "msvc")
61+
flags: compiler
62+
build: ["ocaml" "gen_ocaml_config.ml"]
63+
substs: "gen_ocaml_config.ml"
64+
extra-source "gen_ocaml_config.ml.in" {
65+
src:
66+
"https://raw.githubusercontent.com/ocaml/opam-source-archives/main/patches/ocaml-system/gen_ocaml_config.ml.in"
67+
checksum: [
68+
"sha256=71bcd3d35e28cbf71eda81991c8741268f4b87ced71573b2e75f64f136cebfc1"
69+
"md5=093e7bec1ec95f9e4c6a313d73c5d840"
70+
]
71+
}

‎packages/ocaml-variants/ocaml-variants.5.2.1+options/opam

Lines changed: 136 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
1+
opam-version: "2.0"
2+
license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception"
3+
synopsis: "Official release of OCaml 5.2.1"
4+
maintainer: [
5+
"David Allsopp <[email protected]>"
6+
"Florian Angeletti <[email protected]>"
7+
]
8+
authors: [
9+
"Xavier Leroy"
10+
"Damien Doligez"
11+
"Alain Frisch"
12+
"Jacques Garrigue"
13+
"Didier Rémy"
14+
"Jérôme Vouillon"
15+
]
16+
homepage: "https://ocaml.org"
17+
bug-reports: "https://github.com/ocaml/opam-repository/issues"
18+
dev-repo: "git+https://github.com/ocaml/ocaml.git#5.2"
19+
depends: [
20+
# This is OCaml 5.2.1
21+
"ocaml" {= "5.2.1" & post}
22+
23+
# General base- packages
24+
"base-unix" {post}
25+
"base-bigarray" {post}
26+
"base-threads" {post}
27+
"base-domains" {post}
28+
"base-nnp" {post}
29+
30+
# Architecture (non-Windows)
31+
# opam-repository at present requires that ocaml-base-compiler is installed
32+
# using an architecture which matches the machine's, since arch is used in
33+
# available fields. Cross-compilation at this stage is an unstable accident.
34+
"host-arch-arm32" {arch = "arm32" & post}
35+
"host-arch-arm64" {arch = "arm64" & post}
36+
"host-arch-ppc64" {arch = "ppc64" & post}
37+
"host-arch-riscv64" {arch = "riscv64" & post}
38+
"host-arch-s390x" {arch = "s390x" & post}
39+
# The Windows ports explicitly select the architecture (see below) this
40+
# facility is not yet available for other platforms.
41+
"host-arch-x86_32" {os != "win32" & arch = "x86_32" & post}
42+
("host-arch-x86_64" {os != "win32" & arch = "x86_64" & post} |
43+
("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32" & arch = "x86_64"}))
44+
"host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post}
45+
46+
# Port selection (Windows)
47+
# amd64 mingw-w64 only
48+
(("arch-x86_64" {os = "win32" & arch = "x86_64"} &
49+
"system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & build}) |
50+
# i686 mingw-w64 only
51+
("arch-x86_32" {os = "win32"} & "ocaml-option-bytecode-only" {os = "win32"} &
52+
"system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & build}) |
53+
# Non-Windows systems
54+
"host-system-other" {os != "win32" & post})
55+
56+
# All the 32-bit architectures are bytecode-only
57+
"ocaml-option-bytecode-only" {arch != "arm64" & arch != "x86_64" & arch != "s390x" & arch != "riscv64" & arch != "ppc64"}
58+
59+
# Support Packages
60+
"flexdll" {>= "0.42" & os = "win32"}
61+
]
62+
conflict-class: "ocaml-core-compiler"
63+
flags: compiler
64+
setenv: CAML_LD_LIBRARY_PATH = "%{lib}%/stublibs"
65+
x-env-path-rewrite: [
66+
[CAML_LD_LIBRARY_PATH (";" {os = "win32"} ":" {os != "win32"}) "target"]
67+
]
68+
build-env: [
69+
[LSAN_OPTIONS = "detect_leaks=0,exitcode=0"]
70+
[ASAN_OPTIONS = "detect_leaks=0,exitcode=0"]
71+
]
72+
build: [
73+
[
74+
"./configure"
75+
"--host=x86_64-w64-mingw32" {os-distribution = "cygwin" & system-mingw:installed & arch-x86_64:installed}
76+
"--host=i686-w64-mingw32" {os-distribution = "cygwin" & system-mingw:installed & arch-x86_32:installed}
77+
"--prefix=%{prefix}%"
78+
"--docdir=%{doc}%/ocaml"
79+
"--with-flexdll=%{flexdll:share}%" {os = "win32" & flexdll:installed}
80+
"-C"
81+
"--with-afl" {ocaml-option-afl:installed}
82+
"--disable-native-compiler" {ocaml-option-bytecode-only:installed}
83+
"--disable-flat-float-array" {ocaml-option-no-flat-float-array:installed}
84+
"--enable-flambda" {ocaml-option-flambda:installed}
85+
"--enable-frame-pointers" {ocaml-option-fp:installed}
86+
"--without-zstd" {ocaml-option-no-compression:installed}
87+
"--enable-tsan" {ocaml-option-tsan:installed}
88+
"CC=cc" {!ocaml-option-32bit:installed & !ocaml-option-musl:installed & (os="openbsd"|os="macos")}
89+
"CC=clang" {ocaml-option-tsan:installed & (os="macos")}
90+
"CC=musl-gcc" {ocaml-option-musl:installed & os-distribution!="alpine"}
91+
"CFLAGS=-Os" {ocaml-option-musl:installed & arch!="arm64"}
92+
"CFLAGS=-Os -mno-outline-atomics" {ocaml-option-musl:installed & arch="arm64"}
93+
"LDFLAGS=-Wl,--no-as-needed,-ldl" {ocaml-option-leak-sanitizer:installed | (ocaml-option-address-sanitizer:installed & os!="macos")}
94+
"CC=gcc -ldl -fsanitize=leak -fno-omit-frame-pointer -O1 -g" {ocaml-option-leak-sanitizer:installed}
95+
"CC=gcc -ldl -fsanitize=address -fno-omit-frame-pointer -O1 -g" {ocaml-option-address-sanitizer:installed & os!="macos"}
96+
"CC=clang -fsanitize=address -fno-omit-frame-pointer -O1 -g" {ocaml-option-address-sanitizer:installed & os="macos"}
97+
"CC=gcc -m32" {ocaml-option-32bit:installed & os="linux"}
98+
"CC=gcc -Wl,-read_only_relocs,suppress -arch i386 -m32" {ocaml-option-32bit:installed & os="macos"}
99+
"ASPP=musl-gcc -c" {ocaml-option-musl:installed & os-distribution!="alpine"}
100+
"--host=i386-linux" {ocaml-option-32bit:installed & os="linux"}
101+
"--host=i386-apple-darwin13.2.0" {ocaml-option-32bit:installed & os="macos"}
102+
"LIBS=-static" {ocaml-option-static:installed}
103+
"--disable-warn-error"
104+
]
105+
[make "-j%{jobs}%"]
106+
]
107+
install: [make "install"]
108+
url {
109+
src: "https://github.com/ocaml/ocaml/releases/download/5.2.1/ocaml-5.2.1.tar.gz"
110+
checksum: "sha256=2d0f8090951a97a2c0e5b8a11e90096c0e1791d2e471e4a67f87e3b974044cd0"
111+
}
112+
conflicts: [
113+
"system-msvc"
114+
]
115+
depopts: [
116+
"ocaml-option-32bit"
117+
"ocaml-option-afl"
118+
"ocaml-option-bytecode-only"
119+
"ocaml-option-no-flat-float-array"
120+
"ocaml-option-flambda"
121+
"ocaml-option-fp"
122+
"ocaml-option-no-compression"
123+
"ocaml-option-musl"
124+
"ocaml-option-leak-sanitizer"
125+
"ocaml-option-address-sanitizer"
126+
"ocaml-option-static"
127+
"ocaml-option-tsan"
128+
]
129+
extra-source "ocaml-variants.install" {
130+
src:
131+
"https://raw.githubusercontent.com/ocaml/opam-source-archives/main/patches/ocaml-variants/ocaml-variants.install"
132+
checksum: [
133+
"sha256=79f2a1a5044a91350a0eb6ce12e261a72a2855c094c425cddf3860e58c486678"
134+
"md5=3e969b841df1f51ca448e6e6295cb451"
135+
]
136+
}

0 commit comments

Comments
 (0)