Skip to content

Commit cedfc3b

Browse files
OctachronOctachron
committed
Create dev package for OCaml 5.1 branch
1 parent 1853726 commit cedfc3b

File tree

4 files changed

+124
-4
lines changed
  • packages
    • ocaml-variants
      • ocaml-variants.5.1.0+trunk
      • ocaml-variants.5.2.0+trunk
    • ocaml

4 files changed

+124
-4
lines changed

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

Lines changed: 2 additions & 2 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.1 development"
44
maintainer: "[email protected]"
55
authors: ["Xavier Leroy" "Damien Doligez" "Alain Frisch" "Jacques Garrigue" "Didier Rémy" "Jérôme Vouillon"]
66
homepage: "https://ocaml.org"
@@ -59,7 +59,7 @@ build: [
5959
]
6060
install: [make "install"]
6161
url {
62-
src: "https://github.com/ocaml/ocaml/archive/trunk.tar.gz"
62+
src: "https://github.com/ocaml/ocaml/archive/5.1.tar.gz"
6363
}
6464
post-messages: [
6565
"A failure in the middle of the build may be caused by build parallelism

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

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
opam-version: "2.0"
2+
license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception"
3+
synopsis: "Current trunk"
4+
maintainer: "[email protected]"
5+
authors: ["Xavier Leroy" "Damien Doligez" "Alain Frisch" "Jacques Garrigue" "Didier Rémy" "Jérôme Vouillon"]
6+
homepage: "https://ocaml.org"
7+
bug-reports: "https://github.com/ocaml/opam-repository/issues"
8+
dev-repo: "git+https://github.com/ocaml/ocaml.git#trunk"
9+
depends: [
10+
"ocaml" {= "5.2.0" & post}
11+
"base-unix" {post}
12+
"base-bigarray" {post}
13+
"base-threads" {post}
14+
"base-domains" {post}
15+
"base-nnp" {post}
16+
"ocaml-option-bytecode-only" {arch != "arm64" & arch != "x86_64"}
17+
"ocaml-beta" {opam-version < "2.1.0"}
18+
]
19+
conflict-class: "ocaml-core-compiler"
20+
flags: [ compiler avoid-version ]
21+
setenv: CAML_LD_LIBRARY_PATH = "%{lib}%/stublibs"
22+
build-env: [
23+
[LSAN_OPTIONS = "detect_leaks=0,exitcode=0"]
24+
[ASAN_OPTIONS = "detect_leaks=0,exitcode=0"]
25+
]
26+
build: [
27+
[
28+
"./configure"
29+
"--prefix=%{prefix}%"
30+
"--docdir=%{doc}%/ocaml"
31+
"-C"
32+
"--with-afl" {ocaml-option-afl:installed}
33+
"--disable-native-compiler" {ocaml-option-bytecode-only:installed}
34+
"--disable-flat-float-array" {ocaml-option-no-flat-float-array:installed}
35+
"--enable-flambda" {ocaml-option-flambda:installed}
36+
"--enable-frame-pointers" {ocaml-option-fp:installed}
37+
"CC=cc" {!ocaml-option-32bit:installed & !ocaml-option-musl:installed & (os="openbsd"|os="macos")}
38+
"CC=musl-gcc" {ocaml-option-musl:installed & os-distribution!="alpine"}
39+
"CFLAGS=-Os" {ocaml-option-musl:installed}
40+
"LDFLAGS=-Wl,--no-as-needed,-ldl" {ocaml-option-leak-sanitizer:installed | (ocaml-option-address-sanitizer:installed & os!="macos")}
41+
"CC=gcc -ldl -fsanitize=leak -fno-omit-frame-pointer -O1 -g" {ocaml-option-leak-sanitizer:installed}
42+
"CC=gcc -ldl -fsanitize=address -fno-omit-frame-pointer -O1 -g" {ocaml-option-address-sanitizer:installed & os!="macos"}
43+
"CC=clang -fsanitize=address -fno-omit-frame-pointer -O1 -g" {ocaml-option-address-sanitizer:installed & os="macos"}
44+
"CC=gcc -m32" {ocaml-option-32bit:installed & os="linux"}
45+
"CC=gcc -Wl,-read_only_relocs,suppress -arch i386 -m32" {ocaml-option-32bit:installed & os="macos"}
46+
"ASPP=cc -c" {!ocaml-option-32bit:installed & !ocaml-option-musl:installed & (os="openbsd"|os="macos")}
47+
"ASPP=musl-gcc -c" {ocaml-option-musl:installed & os-distribution!="alpine"}
48+
"ASPP=gcc -m32 -c" {ocaml-option-32bit:installed & os="linux"}
49+
"ASPP=gcc -arch i386 -m32 -c" {ocaml-option-32bit:installed & os="macos"}
50+
"AS=as --32" {ocaml-option-32bit:installed & os="linux"}
51+
"AS=as -arch i386" {ocaml-option-32bit:installed & os="macos"}
52+
"--host=i386-linux" {ocaml-option-32bit:installed & os="linux"}
53+
"--host=i386-apple-darwin13.2.0" {ocaml-option-32bit:installed & os="macos"}
54+
"PARTIALLD=ld -r -melf_i386" {ocaml-option-32bit:installed & os="linux"}
55+
"LIBS=-static" {ocaml-option-static:installed}
56+
"--disable-warn-error"
57+
]
58+
[make "-j%{jobs}%"]
59+
]
60+
install: [make "install"]
61+
url {
62+
src: "https://github.com/ocaml/ocaml/archive/trunk.tar.gz"
63+
}
64+
post-messages: [
65+
"A failure in the middle of the build may be caused by build parallelism
66+
(enabled by default).
67+
See https://github.com/ocaml/opam-repository/pull/14257 for more info."
68+
{failure & jobs > 1 & os != "cygwin"}
69+
"You can try installing again including --jobs=1
70+
to force a sequential build instead."
71+
{failure & jobs > 1 & os != "cygwin" & opam-version >= "2.0.5"}
72+
]
73+
depopts: [
74+
"ocaml-option-32bit"
75+
"ocaml-option-afl"
76+
"ocaml-option-bytecode-only"
77+
"ocaml-option-no-flat-float-array"
78+
"ocaml-option-flambda"
79+
"ocaml-option-fp"
80+
"ocaml-option-musl"
81+
"ocaml-option-leak-sanitizer"
82+
"ocaml-option-address-sanitizer"
83+
"ocaml-option-static"
84+
]

‎packages/ocaml/ocaml.5.1.0/opam‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ maintainer: "[email protected]"
88
depends: [
99
"ocaml-config" {>= "3"}
1010
"ocaml-base-compiler" {= "5.1.0"} |
11-
"ocaml-variants" {>= "5.1.0" & < "5.1.1~"} |
12-
"ocaml-system" {>= "5.1.0" & < "5.1.1~"} |
11+
"ocaml-variants" {>= "5.1.0~" & < "5.1.1~"} |
12+
"ocaml-system" {>= "5.1.0~" & < "5.1.1~"} |
1313
"dkml-base-compiler" {>= "5.1.0~" & < "5.1.1~"}
1414
]
1515
setenv: [

‎packages/ocaml/ocaml.5.2.0/opam‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
opam-version: "2.0"
2+
license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception"
3+
synopsis: "The OCaml compiler (virtual package)"
4+
description: """
5+
This package requires a matching implementation of OCaml,
6+
and polls it to initialise specific variables like `ocaml:native-dynlink`"""
7+
maintainer: "[email protected]"
8+
depends: [
9+
"ocaml-config" {>= "3"}
10+
"ocaml-base-compiler" {= "5.2.0"} |
11+
"ocaml-variants" {>= "5.2.0~" & < "5.2.1~"} |
12+
"ocaml-system" {>= "5.2.0~" & < "5.2.1~"} |
13+
"dkml-base-compiler" {>= "5.2.0~" & < "5.2.1~"}
14+
]
15+
setenv: [
16+
[CAML_LD_LIBRARY_PATH = "%{_:stubsdir}%"]
17+
[CAML_LD_LIBRARY_PATH += "%{lib}%/stublibs"]
18+
[OCAML_TOPLEVEL_PATH = "%{toplevel}%"]
19+
]
20+
build: ["ocaml" "%{ocaml-config:share}%/gen_ocaml_config.ml" _:version _:name]
21+
build-env: [
22+
[CAML_LD_LIBRARY_PATH = ""]
23+
[LSAN_OPTIONS = "detect_leaks=0,exitcode=0"]
24+
[ASAN_OPTIONS = "detect_leaks=0,exitcode=0"]
25+
]
26+
homepage: "https://ocaml.org"
27+
bug-reports: "https://github.com/ocaml/opam-repository/issues"
28+
authors: [
29+
"Xavier Leroy"
30+
"Damien Doligez"
31+
"Alain Frisch"
32+
"Jacques Garrigue"
33+
"Didier Rémy"
34+
"Jérôme Vouillon"
35+
]
36+
flags: conf

0 commit comments

Comments
 (0)