Skip to content

Commit 45f9617

Browse files
mserimseri
authored
Merge pull request #26585 from dra27/trunk-tweaks
Remove parallelism warning from 4.14+
2 parents 6c49626 + 631a0a4 commit 45f9617

File tree

18 files changed

+11
-145
lines changed
  • packages
    • ocaml-base-compiler
      • ocaml-base-compiler.4.14.0
      • ocaml-base-compiler.4.14.1
      • ocaml-base-compiler.4.14.2
      • ocaml-base-compiler.5.0.0
      • ocaml-base-compiler.5.1.0
      • ocaml-base-compiler.5.1.1
      • ocaml-base-compiler.5.2.0
    • ocaml-variants
      • ocaml-variants.4.13.2+trunk
      • ocaml-variants.4.14.0+options
      • ocaml-variants.4.14.1+BER
      • ocaml-variants.4.14.1+options
      • ocaml-variants.4.14.2+options
      • ocaml-variants.4.14.3+trunk
      • ocaml-variants.5.0.0+options
      • ocaml-variants.5.0.0+tsan
      • ocaml-variants.5.0.1+trunk
      • ocaml-variants.5.1.2+trunk
      • ocaml-variants.5.2.1+trunk

18 files changed

+11
-145
lines changed

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

-9
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,6 @@ url {
7979
src: "https://github.com/ocaml/ocaml/archive/4.14.0.tar.gz"
8080
checksum: "sha256=39f44260382f28d1054c5f9d8bf4753cb7ad64027da792f7938344544da155e8"
8181
}
82-
post-messages: [
83-
"A failure in the middle of the build may be caused by build parallelism
84-
(enabled by default).
85-
Please file a bug report at https://github.com/ocaml/opam-repository/issues"
86-
{failure & jobs > 1}
87-
"You can try installing again including --jobs=1
88-
to force a sequential build instead."
89-
{failure & jobs > 1 & opam-version >= "2.0.5"}
90-
]
9182
extra-source "ocaml-base-compiler.install" {
9283
src:
9384
"https://raw.githubusercontent.com/ocaml/opam-source-archives/main/patches/ocaml-base-compiler/ocaml-base-compiler.install"

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

-9
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,6 @@ url {
7979
src: "https://github.com/ocaml/ocaml/archive/4.14.1.tar.gz"
8080
checksum: "sha256=776006e6f0b9bcfb6d9d74381c588e587432ca85562fde93bb80472a5145b028"
8181
}
82-
post-messages: [
83-
"A failure in the middle of the build may be caused by build parallelism
84-
(enabled by default).
85-
Please file a bug report at https://github.com/ocaml/opam-repository/issues"
86-
{failure & jobs > 1}
87-
"You can try installing again including --jobs=1
88-
to force a sequential build instead."
89-
{failure & jobs > 1 & opam-version >= "2.0.5"}
90-
]
9182
extra-source "ocaml-base-compiler.install" {
9283
src:
9384
"https://raw.githubusercontent.com/ocaml/opam-source-archives/main/patches/ocaml-base-compiler/ocaml-base-compiler.install"

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

-9
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,6 @@ url {
7979
src: "https://github.com/ocaml/ocaml/archive/4.14.2.tar.gz"
8080
checksum: "sha256=c2d706432f93ba85bd3383fa451d74543c32a4e84a1afaf3e8ace18f7f097b43"
8181
}
82-
post-messages: [
83-
"A failure in the middle of the build may be caused by build parallelism
84-
(enabled by default).
85-
Please file a bug report at https://github.com/ocaml/opam-repository/issues"
86-
{failure & jobs > 1}
87-
"You can try installing again including --jobs=1
88-
to force a sequential build instead."
89-
{failure & jobs > 1 & opam-version >= "2.0.5"}
90-
]
9182
extra-source "ocaml-base-compiler.install" {
9283
src:
9384
"https://raw.githubusercontent.com/ocaml/opam-source-archives/main/patches/ocaml-base-compiler/ocaml-base-compiler.install"

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

-9
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,6 @@ url {
7878
src: "https://github.com/ocaml/ocaml/archive/5.0.0.tar.gz"
7979
checksum: "sha256=72fa3d0ba19b82fcb9e6c62e0090b9d22e5905c4be0f94faf56904a9377a9e5b"
8080
}
81-
post-messages: [
82-
"A failure in the middle of the build may be caused by build parallelism
83-
(enabled by default).
84-
Please file a bug report at https://github.com/ocaml/opam-repository/issues"
85-
{failure & jobs > 1}
86-
"You can try installing again including --jobs=1
87-
to force a sequential build instead."
88-
{failure & jobs > 1 & opam-version >= "2.0.5"}
89-
]
9081
extra-source "ocaml-base-compiler.install" {
9182
src:
9283
"https://raw.githubusercontent.com/ocaml/opam-source-archives/main/patches/ocaml-base-compiler/ocaml-base-compiler.install"

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

-9
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,6 @@ url {
7878
src: "https://github.com/ocaml/ocaml/archive/5.1.0.tar.gz"
7979
checksum: "sha256=43a3ac7aab7f8880f2bb6221317be55319b356e517622fdc28359fe943e6a450"
8080
}
81-
post-messages: [
82-
"A failure in the middle of the build may be caused by build parallelism
83-
(enabled by default).
84-
Please file a bug report at https://github.com/ocaml/opam-repository/issues"
85-
{failure & jobs > 1}
86-
"You can try installing again including --jobs=1
87-
to force a sequential build instead."
88-
{failure & jobs > 1 & opam-version >= "2.0.5"}
89-
]
9081
extra-source "ocaml-base-compiler.install" {
9182
src:
9283
"https://raw.githubusercontent.com/ocaml/opam-source-archives/main/patches/ocaml-base-compiler/ocaml-base-compiler.install"

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

-9
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,6 @@ url {
7878
src: "https://github.com/ocaml/ocaml/archive/5.1.1.tar.gz"
7979
checksum: "sha256=57f7b382b3d71198413ede405d95ef3506f1cdc480cda1dca1e26b37cb090e17"
8080
}
81-
post-messages: [
82-
"A failure in the middle of the build may be caused by build parallelism
83-
(enabled by default).
84-
Please file a bug report at https://github.com/ocaml/opam-repository/issues"
85-
{failure & jobs > 1}
86-
"You can try installing again including --jobs=1
87-
to force a sequential build instead."
88-
{failure & jobs > 1 & opam-version >= "2.0.5"}
89-
]
9081
extra-source "ocaml-base-compiler.install" {
9182
src:
9283
"https://raw.githubusercontent.com/ocaml/opam-source-archives/main/patches/ocaml-base-compiler/ocaml-base-compiler.install"

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

-9
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,6 @@ url {
7878
src: "https://github.com/ocaml/ocaml/archive/5.2.0.tar.gz"
7979
checksum: "sha256=48554abfd530fcdaa08f23f801b699e4f74c320ddf7d0bd56b0e8c24e55fc911"
8080
}
81-
post-messages: [
82-
"A failure in the middle of the build may be caused by build parallelism
83-
(enabled by default).
84-
Please file a bug report at https://github.com/ocaml/opam-repository/issues"
85-
{failure & jobs > 1}
86-
"You can try installing again including --jobs=1
87-
to force a sequential build instead."
88-
{failure & jobs > 1 & opam-version >= "2.0.5"}
89-
]
9081
extra-source "ocaml-base-compiler.install" {
9182
src:
9283
"https://raw.githubusercontent.com/ocaml/opam-source-archives/main/patches/ocaml-base-compiler/ocaml-base-compiler.install"

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

-9
Original file line numberDiff line numberDiff line change
@@ -100,15 +100,6 @@ install: [make "install"]
100100
url {
101101
src: "https://github.com/ocaml/ocaml/archive/4.13.tar.gz"
102102
}
103-
post-messages: [
104-
"A failure in the middle of the build may be caused by build parallelism
105-
(enabled by default).
106-
See https://github.com/ocaml/opam-repository/pull/14257 for more info."
107-
{failure & jobs > 1 & os != "cygwin"}
108-
"You can try installing again including --jobs=1
109-
to force a sequential build instead."
110-
{failure & jobs > 1 & os != "cygwin" & opam-version >= "2.0.5"}
111-
]
112103
depopts: [
113104
"ocaml-option-32bit"
114105
"ocaml-option-afl"

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

-9
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,6 @@ url {
9999
src: "https://github.com/ocaml/ocaml/archive/4.14.0.tar.gz"
100100
checksum: "sha256=39f44260382f28d1054c5f9d8bf4753cb7ad64027da792f7938344544da155e8"
101101
}
102-
post-messages: [
103-
"A failure in the middle of the build may be caused by build parallelism
104-
(enabled by default).
105-
Please file a bug report at https://github.com/ocaml/opam-repository/issues"
106-
{failure & jobs > 1}
107-
"You can try installing again including --jobs=1
108-
to force a sequential build instead."
109-
{failure & jobs > 1 & opam-version >= "2.0.5"}
110-
]
111102
depopts: [
112103
"ocaml-option-32bit"
113104
"ocaml-option-afl"

‎packages/ocaml-variants/ocaml-variants.4.14.1+BER/opam

-9
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,6 @@ url {
6464
"md5=ebdc0ce3b02aacd0567f4136b1b16074"
6565
]
6666
}
67-
post-messages: [
68-
"A failure in the middle of the build may be caused by build parallelism
69-
(enabled by default).
70-
Please file a bug report at https://github.com/ocaml/opam-repository/issues"
71-
{failure & jobs > 1}
72-
"You can try installing again including --jobs=1
73-
to force a sequential build instead."
74-
{failure & jobs > 1 & opam-version >= "2.0.5"}
75-
]
7667
depopts: [
7768
"ocaml-option-32bit"
7869
"ocaml-option-afl"

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

-9
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,6 @@ url {
9999
src: "https://github.com/ocaml/ocaml/archive/4.14.1.tar.gz"
100100
checksum: "sha256=776006e6f0b9bcfb6d9d74381c588e587432ca85562fde93bb80472a5145b028"
101101
}
102-
post-messages: [
103-
"A failure in the middle of the build may be caused by build parallelism
104-
(enabled by default).
105-
Please file a bug report at https://github.com/ocaml/opam-repository/issues"
106-
{failure & jobs > 1}
107-
"You can try installing again including --jobs=1
108-
to force a sequential build instead."
109-
{failure & jobs > 1 & opam-version >= "2.0.5"}
110-
]
111102
depopts: [
112103
"ocaml-option-32bit"
113104
"ocaml-option-afl"

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

-9
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,6 @@ url {
9999
src: "https://github.com/ocaml/ocaml/archive/4.14.2.tar.gz"
100100
checksum: "sha256=c2d706432f93ba85bd3383fa451d74543c32a4e84a1afaf3e8ace18f7f097b43"
101101
}
102-
post-messages: [
103-
"A failure in the middle of the build may be caused by build parallelism
104-
(enabled by default).
105-
Please file a bug report at https://github.com/ocaml/opam-repository/issues"
106-
{failure & jobs > 1}
107-
"You can try installing again including --jobs=1
108-
to force a sequential build instead."
109-
{failure & jobs > 1 & opam-version >= "2.0.5"}
110-
]
111102
depopts: [
112103
"ocaml-option-32bit"
113104
"ocaml-option-afl"

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

+8-10
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,14 @@ maintainer: [
55
"David Allsopp <[email protected]>"
66
"Florian Angeletti <[email protected]>"
77
]
8-
authors: ["Xavier Leroy" "Damien Doligez" "Alain Frisch" "Jacques Garrigue" "Didier Rémy" "Jérôme Vouillon"]
8+
authors: [
9+
"Xavier Leroy"
10+
"Damien Doligez"
11+
"Alain Frisch"
12+
"Jacques Garrigue"
13+
"Didier Rémy"
14+
"Jérôme Vouillon"
15+
]
916
homepage: "https://ocaml.org"
1017
bug-reports: "https://github.com/ocaml/opam-repository/issues"
1118
dev-repo: "git+https://github.com/ocaml/ocaml.git#4.14"
@@ -101,15 +108,6 @@ install: [make "install"]
101108
url {
102109
src: "https://github.com/ocaml/ocaml/archive/4.14.tar.gz"
103110
}
104-
post-messages: [
105-
"A failure in the middle of the build may be caused by build parallelism
106-
(enabled by default).
107-
See https://github.com/ocaml/opam-repository/pull/14257 for more info."
108-
{failure & jobs > 1}
109-
"You can try installing again including --jobs=1
110-
to force a sequential build instead."
111-
{failure & jobs > 1 & opam-version >= "2.0.5"}
112-
]
113111
depopts: [
114112
"ocaml-option-32bit"
115113
"ocaml-option-afl"

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

-9
Original file line numberDiff line numberDiff line change
@@ -112,15 +112,6 @@ url {
112112
src: "https://github.com/ocaml/ocaml/archive/5.0.0.tar.gz"
113113
checksum: "sha256=72fa3d0ba19b82fcb9e6c62e0090b9d22e5905c4be0f94faf56904a9377a9e5b"
114114
}
115-
post-messages: [
116-
"A failure in the middle of the build may be caused by build parallelism
117-
(enabled by default).
118-
Please file a bug report at https://github.com/ocaml/opam-repository/issues"
119-
{failure & jobs > 1}
120-
"You can try installing again including --jobs=1
121-
to force a sequential build instead."
122-
{failure & jobs > 1 & opam-version >= "2.0.5"}
123-
]
124115
conflicts: [
125116
"ocaml-option-fp"
126117
"system-msvc"

‎packages/ocaml-variants/ocaml-variants.5.0.0+tsan/opam

-9
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,6 @@ url {
4949
src:
5050
"https://github.com/ocaml-multicore/ocaml-tsan/archive/5.0.0+tsan.tar.gz"
5151
}
52-
post-messages: [
53-
"A failure in the middle of the build may be caused by build parallelism
54-
(enabled by default).
55-
Please file a bug report at https://github.com/ocaml/opam-repository/issues"
56-
{failure & jobs > 1}
57-
"You can try installing again including --jobs=1
58-
to force a sequential build instead."
59-
{failure & jobs > 1 & opam-version >= "2.0.5"}
60-
]
6152
conflicts: [
6253
"ocaml-option-afl"
6354
"ocaml-option-bytecode-only"

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

+1-9
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ x-env-path-rewrite: [
6868
[CAML_LD_LIBRARY_PATH (";" {os = "win32"} ":" {os != "win32"}) "target"]
6969
]
7070
build-env: [
71+
[MSYS2_ARG_CONV_EXCL = "*"]
7172
[LSAN_OPTIONS = "detect_leaks=0,exitcode=0"]
7273
[ASAN_OPTIONS = "detect_leaks=0,exitcode=0"]
7374
]
@@ -112,15 +113,6 @@ install: [make "install"]
112113
url {
113114
src: "https://github.com/ocaml/ocaml/archive/5.0.tar.gz"
114115
}
115-
post-messages: [
116-
"A failure in the middle of the build may be caused by build parallelism
117-
(enabled by default).
118-
See https://github.com/ocaml/opam-repository/pull/14257 for more info."
119-
{failure & jobs > 1 & os != "cygwin"}
120-
"You can try installing again including --jobs=1
121-
to force a sequential build instead."
122-
{failure & jobs > 1 & os != "cygwin" & opam-version >= "2.0.5"}
123-
]
124116
conflicts: [
125117
"ocaml-option-fp"
126118
"system-msvc"

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

+1
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ x-env-path-rewrite: [
6868
[CAML_LD_LIBRARY_PATH (";" {os = "win32"} ":" {os != "win32"}) "target"]
6969
]
7070
build-env: [
71+
[MSYS2_ARG_CONV_EXCL = "*"]
7172
[LSAN_OPTIONS = "detect_leaks=0,exitcode=0"]
7273
[ASAN_OPTIONS = "detect_leaks=0,exitcode=0"]
7374
]

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

+1
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ x-env-path-rewrite: [
6868
[CAML_LD_LIBRARY_PATH (";" {os = "win32"} ":" {os != "win32"}) "target"]
6969
]
7070
build-env: [
71+
[MSYS2_ARG_CONV_EXCL = "*"]
7172
[LSAN_OPTIONS = "detect_leaks=0,exitcode=0"]
7273
[ASAN_OPTIONS = "detect_leaks=0,exitcode=0"]
7374
]

0 commit comments

Comments
 (0)