Skip to content

Commit 8106bcf

Browse files
shonfedershonfeder
authored
Merge pull request ocaml#27808 from Octachron/Ocaml_5.4.0_branching
OCaml compiler: redirect ocaml-variants.5.4.0+trunk to the 5.4 branch
2 parents 7f75be6 + 01d28df commit 8106bcf

File tree

2 files changed

+137
-110
lines changed
  • packages
    • ocaml-compiler/ocaml-compiler.5.4
    • ocaml-variants/ocaml-variants.5.4.0+trunk

2 files changed

+137
-110
lines changed

‎packages/ocaml-compiler/ocaml-compiler.5.4/opam‎

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

‎packages/ocaml-variants/ocaml-variants.5.4.0+trunk/opam‎

Lines changed: 4 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
opam-version: "2.0"
22
license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception"
3-
synopsis: "Current trunk"
3+
synopsis: "Latest 5.4 development"
44
maintainer: [
55
"David Allsopp <[email protected]>"
66
"Florian Angeletti <[email protected]>"
@@ -11,122 +11,16 @@ authors: [
1111
"Alain Frisch"
1212
"Jacques Garrigue"
1313
"Didier Rémy"
14+
"KC Sivaramakrishnan"
1415
"Jérôme Vouillon"
1516
]
1617
homepage: "https://ocaml.org"
1718
bug-reports: "https://github.com/ocaml/opam-repository/issues"
18-
dev-repo: "git+https://github.com/ocaml/ocaml.git#trunk"
19+
dev-repo: "git+https://github.com/ocaml/ocaml.git#5.4"
1920
depends: [
20-
# This is OCaml 5.4.0
21-
"ocaml" {= "5.4.0" & 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-
"base-effects" {post}
21+
"ocaml-compiler" {= "5.4"}
3022

3123
"ocaml-beta" {opam-version < "2.1.0"}
32-
33-
# Architecture (non-Windows)
34-
# opam-repository at present requires that ocaml-base-compiler is installed
35-
# using an architecture which matches the machine's, since arch is used in
36-
# available fields. Cross-compilation at this stage is an unstable accident.
37-
"host-arch-arm32" {arch = "arm32" & post}
38-
"host-arch-arm64" {arch = "arm64" & post}
39-
"host-arch-ppc64" {arch = "ppc64" & post}
40-
"host-arch-riscv64" {arch = "riscv64" & post}
41-
"host-arch-s390x" {arch = "s390x" & post}
42-
# The Windows ports explicitly select the architecture (see below) this
43-
# facility is not yet available for other platforms.
44-
"host-arch-x86_32" {os != "win32" & arch = "x86_32" & post}
45-
("host-arch-x86_64" {os != "win32" & arch = "x86_64" & post} |
46-
("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32" & arch = "x86_64"}))
47-
"host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post}
48-
49-
# Port selection (Windows)
50-
# amd64 mingw-w64 / MSVC
51-
(("arch-x86_64" {os = "win32" & arch = "x86_64"} &
52-
(("system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & build}) |
53-
("system-msvc" & "winpthreads" & "ocaml-option-no-compression" {os = "win32"}))) |
54-
# i686 mingw-w64 / MSVC
55-
("arch-x86_32" {os = "win32"} & "ocaml-option-bytecode-only" {os = "win32"} &
56-
(("system-mingw" & "mingw-w64-shims" {os-distribution = "cygwin" & build}) |
57-
("system-msvc" & "winpthreads" & "ocaml-option-no-compression" {os = "win32"}))) |
58-
# Non-Windows systems
59-
"host-system-other" {os != "win32" & post})
60-
61-
# All the 32-bit architectures are bytecode-only
62-
"ocaml-option-bytecode-only" {arch != "arm64" & arch != "x86_64" & arch != "s390x" & arch != "riscv64" & arch != "ppc64"}
63-
64-
# Support Packages
65-
"flexdll" {>= "0.42" & os = "win32"}
6624
]
6725
conflict-class: "ocaml-core-compiler"
6826
flags: [ compiler avoid-version ]
69-
setenv: CAML_LD_LIBRARY_PATH = "%{lib}%/stublibs"
70-
x-env-path-rewrite: [
71-
[CAML_LD_LIBRARY_PATH (";" {os = "win32"} ":" {os != "win32"}) "target"]
72-
]
73-
build-env: [
74-
[MSYS2_ARG_CONV_EXCL = "*"]
75-
[LSAN_OPTIONS = "detect_leaks=0,exitcode=0"]
76-
[ASAN_OPTIONS = "detect_leaks=0,exitcode=0"]
77-
]
78-
build: [
79-
[
80-
"./configure"
81-
"--host=x86_64-pc-windows" {system-msvc:installed & arch-x86_64:installed}
82-
"--host=x86_64-w64-mingw32" {os-distribution = "cygwin" & system-mingw:installed & arch-x86_64:installed}
83-
"--host=i686-pc-windows" {system-msvc:installed & arch-x86_32:installed}
84-
"--host=i686-w64-mingw32" {os-distribution = "cygwin" & system-mingw:installed & arch-x86_32:installed}
85-
"--prefix=%{prefix}%"
86-
"--docdir=%{doc}%/ocaml"
87-
"--with-flexdll=%{flexdll:share}%" {os = "win32" & flexdll:installed}
88-
"--with-winpthreads-msvc=%{winpthreads:share}%" {system-msvc:installed}
89-
"-C"
90-
"--with-afl" {ocaml-option-afl:installed}
91-
"--disable-native-compiler" {ocaml-option-bytecode-only:installed}
92-
"--disable-flat-float-array" {ocaml-option-no-flat-float-array:installed}
93-
"--enable-flambda" {ocaml-option-flambda:installed}
94-
"--enable-frame-pointers" {ocaml-option-fp:installed}
95-
"--without-zstd" {ocaml-option-no-compression:installed}
96-
"--enable-tsan" {ocaml-option-tsan:installed}
97-
"CC=cc" {!ocaml-option-32bit:installed & !ocaml-option-musl:installed & (os="openbsd"|os="macos")}
98-
"CC=clang" {ocaml-option-tsan:installed & (os="macos")}
99-
"CC=musl-gcc" {ocaml-option-musl:installed & os-distribution!="alpine"}
100-
"CFLAGS=-Os" {ocaml-option-musl:installed}
101-
"LDFLAGS=-Wl,--no-as-needed,-ldl" {ocaml-option-leak-sanitizer:installed | (ocaml-option-address-sanitizer:installed & os!="macos")}
102-
"CC=gcc -ldl -fsanitize=leak -fno-omit-frame-pointer -O1 -g" {ocaml-option-leak-sanitizer:installed}
103-
"CC=gcc -ldl -fsanitize=address -fno-omit-frame-pointer -O1 -g" {ocaml-option-address-sanitizer:installed & os!="macos"}
104-
"CC=clang -fsanitize=address -fno-omit-frame-pointer -O1 -g" {ocaml-option-address-sanitizer:installed & os="macos"}
105-
"CC=gcc -m32" {ocaml-option-32bit:installed & os="linux"}
106-
"CC=gcc -Wl,-read_only_relocs,suppress -arch i386 -m32" {ocaml-option-32bit:installed & os="macos"}
107-
"ASPP=musl-gcc -c" {ocaml-option-musl:installed & os-distribution!="alpine"}
108-
"--host=i386-linux" {ocaml-option-32bit:installed & os="linux"}
109-
"--host=i386-apple-darwin13.2.0" {ocaml-option-32bit:installed & os="macos"}
110-
"LIBS=-static" {ocaml-option-static:installed}
111-
"--disable-warn-error"
112-
]
113-
[make "-j%{jobs}%"]
114-
]
115-
install: [make "install"]
116-
url {
117-
src: "https://github.com/ocaml/ocaml/archive/trunk.tar.gz"
118-
}
119-
depopts: [
120-
"ocaml-option-32bit"
121-
"ocaml-option-afl"
122-
"ocaml-option-bytecode-only"
123-
"ocaml-option-no-flat-float-array"
124-
"ocaml-option-flambda"
125-
"ocaml-option-fp"
126-
"ocaml-option-no-compression"
127-
"ocaml-option-musl"
128-
"ocaml-option-leak-sanitizer"
129-
"ocaml-option-address-sanitizer"
130-
"ocaml-option-static"
131-
"ocaml-option-tsan"
132-
]

0 commit comments

Comments
 (0)