1 |
commit: ada47650ac0726cd0739f82ef3f1fbb63a1492db |
2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue May 3 18:03:43 2016 +0000 |
4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 3 18:29:42 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ada47650 |
7 |
|
8 |
dev-ml/core: bump to 113.33.02 and fix build with ocaml 4.03 |
9 |
|
10 |
Package-Manager: portage-2.2.28 |
11 |
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> |
12 |
|
13 |
dev-ml/core/Manifest | 1 + |
14 |
dev-ml/core/core-113.33.02.ebuild | 58 ++++++++ |
15 |
dev-ml/core/files/oc43.patch | 279 ++++++++++++++++++++++++++++++++++++++ |
16 |
3 files changed, 338 insertions(+) |
17 |
|
18 |
diff --git a/dev-ml/core/Manifest b/dev-ml/core/Manifest |
19 |
index 6c39ee5..817ede8 100644 |
20 |
--- a/dev-ml/core/Manifest |
21 |
+++ b/dev-ml/core/Manifest |
22 |
@@ -2,3 +2,4 @@ DIST core-113.24.00.tar.gz 806394 SHA256 66ab36a4d7b78a4710f992c670777919ae329dc |
23 |
DIST core-113.24.01.tar.gz 806424 SHA256 16470035f9e21e8accdaa3286c3e353f60c485402323644fd231412fccf6d9c6 SHA512 8bfe45a1d0a1973ae7cd317fd6c71d2bb3a6170e432f735e6504586cd4d51b29dec972588478f4abdc7d20d6967ca58afa3ecb5a18871c807437bf8b73e063ec WHIRLPOOL 3bbc8c54140d6277885c37a525af1467ea1c30c7bc4d9dd55738432eca7e4460fed55c7499aad35a46cff324492b0797c40919f926856d6c9d5cc7fd7728705d |
24 |
DIST core-113.24.02.tar.gz 806413 SHA256 c5a4821df9719aa0a6b87b546730de445b698cc86b28046e7b5883cb65f02e29 SHA512 7f2f3e8524704ce7d29d55904f62cbf6c5b932275171b4b03709fcbdb98954cb2cab8427f06c7d6ee5ba396ac58e1077421162d96aa91b8e182f3e0f2d07cac4 WHIRLPOOL decd161a3aeb9573638c8cbec0c126d83f1a3f4eedc9fc06d53c02ff05eef18a7be781cfde05aac730c7683eed186f14f78cf1b80600843a1b3ffceec712604d |
25 |
DIST core-113.33.00.tar.gz 806877 SHA256 cca2511bb16ee5788daf42cdeec90c75698c07a995a0fde5c27373a7993c9a6b SHA512 5ee4e9d6dcc078a518d947d09fc6adfa7f79d299539e79d3b8e3b86c6b3c494144f42b755dfb04165e3af68058c87d6a567f7e94913575d9f371a21f63bdfc9e WHIRLPOOL 50719bf6f72e3ef6f9be477c24e5b9756793c69864c0540ae8508789f95833f0247ee77f86879b44f15ac19d075b25f9bc55e9e049ba51dd9606351dbe74b121 |
26 |
+DIST core-113.33.02.tar.gz 806999 SHA256 42f474e7c0b907bc3cd10defbc2de49547aa8c23bb86e39aa7abcc6ea1ff5c06 SHA512 da498c116dc4844455370c28b4cdab9f3dcc576a99f82ed7795cb7a8e65de01364f048588d4be6ca80b979f379d8bc4b4ab46eee17b557bdb75cac1e585badea WHIRLPOOL cb647f13482d4bef7b83fce35434acdeaa2c5df6ebf999b41ba2c8b5dc6754ddf4939d89239be79e120113570bfdd0e839feb7374d9e25457379bfdd1092a3c0 |
27 |
|
28 |
diff --git a/dev-ml/core/core-113.33.02.ebuild b/dev-ml/core/core-113.33.02.ebuild |
29 |
new file mode 100644 |
30 |
index 0000000..80e1a06 |
31 |
--- /dev/null |
32 |
+++ b/dev-ml/core/core-113.33.02.ebuild |
33 |
@@ -0,0 +1,58 @@ |
34 |
+# Copyright 1999-2015 Gentoo Foundation |
35 |
+# Distributed under the terms of the GNU General Public License v2 |
36 |
+# $Id$ |
37 |
+ |
38 |
+EAPI="5" |
39 |
+ |
40 |
+OASIS_BUILD_DOCS=1 |
41 |
+OASIS_BUILD_TESTS=1 |
42 |
+ |
43 |
+inherit eutils oasis |
44 |
+ |
45 |
+MY_P=${P/_/\~} |
46 |
+DESCRIPTION="Jane Street's alternative to the standard library" |
47 |
+HOMEPAGE="http://www.janestreet.com/ocaml" |
48 |
+SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}/files/${P}.tar.gz" |
49 |
+ |
50 |
+LICENSE="LGPL-2.1-with-linking-exception" |
51 |
+SLOT="0/${PV}" |
52 |
+KEYWORDS="~amd64" |
53 |
+IUSE="" |
54 |
+ |
55 |
+RDEPEND=" |
56 |
+ >=dev-ml/bin-prot-113.24.00:= |
57 |
+ >=dev-ml/core_kernel-113.24.00:= |
58 |
+ >=dev-ml/fieldslib-113.24.00:= |
59 |
+ dev-ml/ppx_assert:= |
60 |
+ dev-ml/ppx_bench:= |
61 |
+ dev-ml/ppx_driver:= |
62 |
+ dev-ml/ppx_expect:= |
63 |
+ dev-ml/ppx_inline_test:= |
64 |
+ dev-ml/ppx_jane:= |
65 |
+ >=dev-ml/sexplib-113.24.00:= |
66 |
+ dev-ml/typerep:= |
67 |
+ dev-ml/variantslib:= |
68 |
+" |
69 |
+DEPEND="${RDEPEND}" |
70 |
+ |
71 |
+src_prepare() { |
72 |
+ has_version '>=dev-lang/ocaml-4.03' && epatch "${FILESDIR}/oc43.patch" |
73 |
+} |
74 |
+ |
75 |
+src_configure() { |
76 |
+ emake setup.exe |
77 |
+ OASIS_SETUP_COMMAND="./setup.exe" oasis_src_configure |
78 |
+} |
79 |
+ |
80 |
+src_compile() { |
81 |
+ emake |
82 |
+} |
83 |
+ |
84 |
+src_install() { |
85 |
+ opam-installer -i \ |
86 |
+ --prefix="${ED}/usr" \ |
87 |
+ --libdir="${D}/$(ocamlc -where)" \ |
88 |
+ --docdir="${ED}/usr/share/doc/${PF}" \ |
89 |
+ ${PN}.install || die |
90 |
+ dodoc CHANGES.md README.md |
91 |
+} |
92 |
|
93 |
diff --git a/dev-ml/core/files/oc43.patch b/dev-ml/core/files/oc43.patch |
94 |
new file mode 100644 |
95 |
index 0000000..5e44a44 |
96 |
--- /dev/null |
97 |
+++ b/dev-ml/core/files/oc43.patch |
98 |
@@ -0,0 +1,279 @@ |
99 |
+diff -uNr core-113.33.02/_oasis core-113.33.02+4.03/_oasis |
100 |
+--- core-113.33.02/_oasis 2016-04-06 11:06:40.000000000 +0200 |
101 |
++++ core-113.33.02+4.03/_oasis 2016-04-06 12:42:48.000000000 +0200 |
102 |
+@@ -1,8 +1,8 @@ |
103 |
+ OASISFormat: 0.4 |
104 |
+-OCamlVersion: >= 4.02.3 |
105 |
++OCamlVersion: >= 4.03.0 |
106 |
+ FindlibVersion: >= 1.3.2 |
107 |
+ Name: core |
108 |
+-Version: 113.33.02 |
109 |
++Version: 113.33.02+4.03 |
110 |
+ Synopsis: Industrial strength alternative to OCaml's standard library |
111 |
+ Authors: Jane Street Group, LLC <opensource@××××××××××.com> |
112 |
+ Copyrights: (C) 2008-2016 Jane Street Group LLC <opensource@××××××××××.com> |
113 |
+diff -uNr core-113.33.02/opam core-113.33.02+4.03/opam |
114 |
+--- core-113.33.02/opam 2016-04-06 11:12:24.000000000 +0200 |
115 |
++++ core-113.33.02+4.03/opam 2016-04-06 12:54:27.000000000 +0200 |
116 |
+@@ -26,4 +26,4 @@ |
117 |
+ "typerep" |
118 |
+ "variantslib" |
119 |
+ ] |
120 |
+-available: [ ocaml-version >= "4.02.3" ] |
121 |
++available: [ ocaml-version >= "4.03.0" ] |
122 |
+diff -uNr core-113.33.02/src/bigstring.ml core-113.33.02+4.03/src/bigstring.ml |
123 |
+--- core-113.33.02/src/bigstring.ml 2016-04-06 11:06:40.000000000 +0200 |
124 |
++++ core-113.33.02+4.03/src/bigstring.ml 2016-04-06 12:42:48.000000000 +0200 |
125 |
+@@ -29,7 +29,7 @@ |
126 |
+ |
127 |
+ let length = Array1.dim |
128 |
+ |
129 |
+-external is_mmapped : t -> bool = "bigstring_is_mmapped_stub" "noalloc" |
130 |
++external is_mmapped : t -> bool = "bigstring_is_mmapped_stub" [@@noalloc] |
131 |
+ |
132 |
+ let init n ~f = |
133 |
+ let t = create n in |
134 |
+@@ -168,7 +168,7 @@ |
135 |
+ |
136 |
+ external unsafe_send_nonblocking_no_sigpipe |
137 |
+ : file_descr -> pos : int -> len : int -> t -> Syscall_result.Int.t |
138 |
+- = "bigstring_send_nonblocking_no_sigpipe_stub" "noalloc" |
139 |
++ = "bigstring_send_nonblocking_no_sigpipe_stub" [@@noalloc] |
140 |
+ |
141 |
+ let send_nonblocking_no_sigpipe fd ?(pos = 0) ?len bstr = |
142 |
+ let len = get_opt_len bstr ~pos len in |
143 |
+diff -uNr core-113.33.02/src/core_sys.ml core-113.33.02+4.03/src/core_sys.ml |
144 |
+--- core-113.33.02/src/core_sys.ml 2016-04-06 11:06:40.000000000 +0200 |
145 |
++++ core-113.33.02+4.03/src/core_sys.ml 2016-04-06 12:42:48.000000000 +0200 |
146 |
+@@ -83,7 +83,7 @@ |
147 |
+ *) |
148 |
+ external executing_bytecode |
149 |
+ : unit -> unit -> unit -> unit -> unit -> unit -> bool |
150 |
+- = "executing_bytecode" "not_executing_bytecode" "noalloc" |
151 |
++ = "executing_bytecode" "not_executing_bytecode" [@@noalloc] |
152 |
+ |
153 |
+ let execution_mode () = |
154 |
+ if executing_bytecode () () () () () () then `Bytecode else `Native |
155 |
+@@ -95,7 +95,7 @@ |
156 |
+ |
157 |
+ |
158 |
+ (* returns size, in bits, of an [int] type in C *) |
159 |
+-external c_int_size : unit -> int = "c_int_size" "noalloc" |
160 |
++external c_int_size : unit -> int = "c_int_size" [@@noalloc] |
161 |
+ |
162 |
+ let%test _ = let size = c_int_size () in size >= 16 && size <= Sys.word_size |
163 |
+ |
164 |
+diff -uNr core-113.33.02/src/core_sys.mli core-113.33.02+4.03/src/core_sys.mli |
165 |
+--- core-113.33.02/src/core_sys.mli 2016-04-06 11:06:40.000000000 +0200 |
166 |
++++ core-113.33.02+4.03/src/core_sys.mli 2016-04-06 12:42:48.000000000 +0200 |
167 |
+@@ -134,7 +134,7 @@ |
168 |
+ (** [c_int_size] returns the number of bits in a C [int]. Note that this can be |
169 |
+ different from [word_size]. For example, Linux x86-64 should have |
170 |
+ [word_size = 64], but [c_int_size () = 32] *) |
171 |
+-external c_int_size : unit -> int = "c_int_size" "noalloc" |
172 |
++external c_int_size : unit -> int = "c_int_size" [@@noalloc] |
173 |
+ |
174 |
+ (** Return the home directory, using the [HOME] environment variable if that is defined, |
175 |
+ and if not, using the effective user's information in the Unix password database. *) |
176 |
+diff -uNr core-113.33.02/src/core_unix.ml core-113.33.02+4.03/src/core_unix.ml |
177 |
+--- core-113.33.02/src/core_unix.ml 2016-04-06 11:06:40.000000000 +0200 |
178 |
++++ core-113.33.02+4.03/src/core_unix.ml 2016-04-06 12:42:48.000000000 +0200 |
179 |
+@@ -393,7 +393,7 @@ |
180 |
+ |
181 |
+ (* Signal handling *) |
182 |
+ |
183 |
+-external abort : unit -> 'a = "unix_abort" "noalloc" |
184 |
++external abort : unit -> 'a = "unix_abort" [@@noalloc] |
185 |
+ |
186 |
+ (* User id, group id management *) |
187 |
+ |
188 |
+@@ -1160,6 +1160,11 @@ |
189 |
+ (fun () -> [("src", atom src); ("dst", atom dst)]) |
190 |
+ ;; |
191 |
+ |
192 |
++let src_dst' f ?to_dir ~src ~dst = |
193 |
++ improve (fun () -> f ?to_dir ~src ~dst) |
194 |
++ (fun () -> [("src", atom src); ("dst", atom dst)]) |
195 |
++;; |
196 |
++ |
197 |
+ let unlink = unary_filename Unix.unlink |
198 |
+ |
199 |
+ let rename = src_dst Unix.rename |
200 |
+@@ -1554,7 +1559,7 @@ |
201 |
+ Exit_or_signal.of_unix (Unix.close_process_full (c.C.stdout, c.C.stdin, c.C.stderr)) |
202 |
+ ;; |
203 |
+ |
204 |
+-let symlink = src_dst Unix.symlink |
205 |
++let symlink = src_dst' Unix.symlink |
206 |
+ let readlink = unary_filename Unix.readlink |
207 |
+ |
208 |
+ module Select_fds = struct |
209 |
+diff -uNr core-113.33.02/src/core_unix.mli core-113.33.02+4.03/src/core_unix.mli |
210 |
+--- core-113.33.02/src/core_unix.mli 2016-04-06 11:06:40.000000000 +0200 |
211 |
++++ core-113.33.02+4.03/src/core_unix.mli 2016-04-06 12:42:48.000000000 +0200 |
212 |
+@@ -910,7 +910,7 @@ |
213 |
+ |
214 |
+ (** [symlink source dest] creates the file [dest] as a symbolic link |
215 |
+ to the file [source]. *) |
216 |
+-val symlink : src:string -> dst:string -> unit |
217 |
++val symlink : ?to_dir:bool -> src:string -> dst:string -> unit |
218 |
+ |
219 |
+ (** Read the contents of a link. *) |
220 |
+ val readlink : string -> string |
221 |
+@@ -2007,7 +2007,7 @@ |
222 |
+ caught and the signal handler does not return. If the SIGABRT signal is |
223 |
+ blocked or ignored, the abort() function will still override it. |
224 |
+ *) |
225 |
+-external abort : unit -> _ = "unix_abort" "noalloc" |
226 |
++external abort : unit -> _ = "unix_abort" [@@noalloc] |
227 |
+ |
228 |
+ (** {2 User id, group id} *) |
229 |
+ |
230 |
+diff -uNr core-113.33.02/src/iobuf.ml core-113.33.02+4.03/src/iobuf.ml |
231 |
+--- core-113.33.02/src/iobuf.ml 2016-04-06 11:06:40.000000000 +0200 |
232 |
++++ core-113.33.02+4.03/src/iobuf.ml 2016-04-06 12:42:48.000000000 +0200 |
233 |
+@@ -1094,7 +1094,7 @@ |
234 |
+ -> (read_write, seek) t array |
235 |
+ -> Recvmmsg_context.ctx |
236 |
+ -> Unix.Syscall_result.Int.t |
237 |
+- = "iobuf_recvmmsg_assume_fd_is_nonblocking_stub" "noalloc" |
238 |
++ = "iobuf_recvmmsg_assume_fd_is_nonblocking_stub" [@@noalloc] |
239 |
+ |
240 |
+ let recvmmsg_assume_fd_is_nonblocking fd { Recvmmsg_context. iobufs; ctx; _ } = |
241 |
+ unsafe_recvmmsg_assume_fd_is_nonblocking fd iobufs ctx |
242 |
+diff -uNr core-113.33.02/src/linux_ext.ml core-113.33.02+4.03/src/linux_ext.ml |
243 |
+--- core-113.33.02/src/linux_ext.ml 2016-04-06 11:06:40.000000000 +0200 |
244 |
++++ core-113.33.02+4.03/src/linux_ext.ml 2016-04-06 12:42:48.000000000 +0200 |
245 |
+@@ -320,7 +320,7 @@ |
246 |
+ -> initial : Int63.t |
247 |
+ -> interval : Int63.t |
248 |
+ -> Syscall_result.Unit.t |
249 |
+- = "linux_timerfd_settime" "noalloc" |
250 |
++ = "linux_timerfd_settime" [@@noalloc] |
251 |
+ |
252 |
+ let%test_unit "unsafe_timerfd_settime returning errno" = |
253 |
+ let result = |
254 |
+@@ -683,13 +683,13 @@ |
255 |
+ type ready_events = Bigstring.t |
256 |
+ |
257 |
+ external epoll_sizeof_epoll_event |
258 |
+- : unit -> int = "linux_epoll_sizeof_epoll_event" "noalloc" |
259 |
++ : unit -> int = "linux_epoll_sizeof_epoll_event" [@@noalloc] |
260 |
+ |
261 |
+ external epoll_offsetof_readyfd |
262 |
+- : unit -> int = "linux_epoll_offsetof_readyfd" "noalloc" |
263 |
++ : unit -> int = "linux_epoll_offsetof_readyfd" [@@noalloc] |
264 |
+ |
265 |
+ external epoll_offsetof_readyflags |
266 |
+- : unit -> int = "linux_epoll_offsetof_readyflags" "noalloc" |
267 |
++ : unit -> int = "linux_epoll_offsetof_readyflags" [@@noalloc] |
268 |
+ |
269 |
+ let sizeof_epoll_event = epoll_sizeof_epoll_event () |
270 |
+ let offsetof_readyfd = epoll_offsetof_readyfd () |
271 |
+diff -uNr core-113.33.02/src/syslog.ml core-113.33.02+4.03/src/syslog.ml |
272 |
+--- core-113.33.02/src/syslog.ml 2016-04-06 11:06:40.000000000 +0200 |
273 |
++++ core-113.33.02+4.03/src/syslog.ml 2016-04-06 12:42:48.000000000 +0200 |
274 |
+@@ -57,8 +57,8 @@ |
275 |
+ |
276 |
+ external core_syslog_openlog : string option -> int -> int -> unit = "core_syslog_openlog" |
277 |
+ external core_syslog_syslog : int -> string -> unit = "core_syslog_syslog" |
278 |
+-external core_syslog_closelog : unit -> unit = "core_syslog_closelog" "noalloc" |
279 |
+-external core_syslog_setlogmask : int -> unit = "core_syslog_setlogmask" "noalloc" |
280 |
++external core_syslog_closelog : unit -> unit = "core_syslog_closelog" [@@noalloc] |
281 |
++external core_syslog_setlogmask : int -> unit = "core_syslog_setlogmask" [@@noalloc] |
282 |
+ |
283 |
+ let openlog ?id ?(options = []) ?(facility = Facility.USER) () = |
284 |
+ core_syslog_openlog id (Open_option.mask options) (Facility.to_int facility) |
285 |
+diff -uNr core-113.33.02/src/time_stamp_counter.ml core-113.33.02+4.03/src/time_stamp_counter.ml |
286 |
+--- core-113.33.02/src/time_stamp_counter.ml 2016-04-06 11:06:40.000000000 +0200 |
287 |
++++ core-113.33.02+4.03/src/time_stamp_counter.ml 2016-04-06 12:42:48.000000000 +0200 |
288 |
+@@ -93,7 +93,7 @@ |
289 |
+ #if JSC_ARCH_SIXTYFOUR |
290 |
+ |
291 |
+ (* noalloc on x86_64 only *) |
292 |
+-external now : unit -> tsc = "tsc_get" "noalloc" |
293 |
++external now : unit -> tsc = "tsc_get" [@@noalloc] |
294 |
+ |
295 |
+ module Calibrator = struct |
296 |
+ |
297 |
+diff -uNr core-113.33.02/src/time_stamp_counter.mli core-113.33.02+4.03/src/time_stamp_counter.mli |
298 |
+--- core-113.33.02/src/time_stamp_counter.mli 2016-04-06 11:06:40.000000000 +0200 |
299 |
++++ core-113.33.02+4.03/src/time_stamp_counter.mli 2016-04-06 12:42:48.000000000 +0200 |
300 |
+@@ -102,7 +102,7 @@ |
301 |
+ end |
302 |
+ |
303 |
+ #if JSC_ARCH_SIXTYFOUR |
304 |
+-external now : unit -> t = "tsc_get" "noalloc" |
305 |
++external now : unit -> t = "tsc_get" [@@noalloc] |
306 |
+ #else |
307 |
+ external now : unit -> t = "tsc_get" |
308 |
+ #endif |
309 |
+diff -uNr core-113.33.02/src/unix_stubs.c core-113.33.02+4.03/src/unix_stubs.c |
310 |
+--- core-113.33.02/src/unix_stubs.c 2016-04-06 11:06:40.000000000 +0200 |
311 |
++++ core-113.33.02+4.03/src/unix_stubs.c 2016-04-06 12:42:48.000000000 +0200 |
312 |
+@@ -213,7 +213,7 @@ |
313 |
+ of strings and fill it will strings contained in the string array |
314 |
+ [arg]. Pointers stored in the result points directly inside the |
315 |
+ OCaml heap. */ |
316 |
+-extern char **cstringvect(value arg); |
317 |
++extern char **cstringvect(value arg, char* cmdname); |
318 |
+ |
319 |
+ /* Given v_prog, an O'Caml string value specifying a program name, |
320 |
+ v_args, an O'Caml array specifying program arguments (not |
321 |
+@@ -378,7 +378,7 @@ |
322 |
+ |
323 |
+ /* We don't bother saving/restoring the environment or freeing the |
324 |
+ new one since we exit the process in case of error. */ |
325 |
+- environ = cstringvect(v_env); |
326 |
++ environ = cstringvect(v_env, "ml_create_process"); |
327 |
+ |
328 |
+ if (Is_block(v_working_dir)) |
329 |
+ working_dir = String_val(Field(v_working_dir, 0)); |
330 |
+diff -uNr core-113.33.02/test/bigstring_test.ml core-113.33.02+4.03/test/bigstring_test.ml |
331 |
+--- core-113.33.02/test/bigstring_test.ml 2016-04-06 11:06:40.000000000 +0200 |
332 |
++++ core-113.33.02+4.03/test/bigstring_test.ml 2016-04-06 12:42:48.000000000 +0200 |
333 |
+@@ -169,7 +169,7 @@ |
334 |
+ simple_conversion_test ~n:"single" "1"; |
335 |
+ repeat 50 (simple_conversion_test ~n:"random") sg; |
336 |
+ ); |
337 |
+- |
338 |
++(* |
339 |
+ "input" >:: |
340 |
+ (fun () -> |
341 |
+ fd_test really_read_test ~n:"single" (bs_of_s "X"); |
342 |
+@@ -178,6 +178,7 @@ |
343 |
+ repeat 100 (fd_test really_read_test ~n:"random big") |
344 |
+ (bsg ~size:(fun () -> 100 * png ())); |
345 |
+ ); |
346 |
++*) |
347 |
+ |
348 |
+ "destruction" >:: |
349 |
+ (fun () -> |
350 |
+@@ -209,6 +210,7 @@ |
351 |
+ blit_test ~n:"random" ~src_pos ~dst_pos ~len (s1,s2)) |
352 |
+ (fun () -> (sg (), sg(),nng (), nng (), nng ())) |
353 |
+ ); |
354 |
++(* |
355 |
+ "really write/read pipe" >:: |
356 |
+ (fun () -> |
357 |
+ let write_read_test = write_read_test Unix.pipe in |
358 |
+@@ -239,6 +241,7 @@ |
359 |
+ repeat 500 (output_input_test ~n:"random big") |
360 |
+ (bsg ~size:(fun () -> 100 * png ())); |
361 |
+ ); |
362 |
++*) |
363 |
+ |
364 |
+ "sub" >:: |
365 |
+ (fun () -> |
366 |
+diff -uNr core-113.33.02/test/hashtbl/table_new_intf.ml core-113.33.02+4.03/test/hashtbl/table_new_intf.ml |
367 |
+--- core-113.33.02/test/hashtbl/table_new_intf.ml 2016-04-06 11:06:40.000000000 +0200 |
368 |
++++ core-113.33.02+4.03/test/hashtbl/table_new_intf.ml 2016-04-06 12:42:48.000000000 +0200 |
369 |
+@@ -7,7 +7,7 @@ |
370 |
+ compare: 'k -> 'k -> int; |
371 |
+ } |
372 |
+ |
373 |
+-external hash_param : int -> int -> 'a -> int = "caml_hash_univ_param" "noalloc" |
374 |
++external hash_param : int -> int -> 'a -> int = "caml_hash_univ_param" [@@noalloc] |
375 |
+ |
376 |
+ let poly = { |
377 |
+ hash = (fun z -> hash_param 10 100 z); |