Updated devel/ocaml-lwt to version 5.2.0. This adds several updates and bugfixes, some of them breaking. For more details see the CHANGES file in the distribution.diff -r1.41 -r1.42 pkgsrc/devel/ocaml-lwt/Makefile
(jaapb)
@@ -1,26 +1,31 @@ | @@ -1,26 +1,31 @@ | |||
1 | # $NetBSD: Makefile,v 1.41 2019/05/13 11:38:45 jaapb Exp $ | 1 | # $NetBSD: Makefile,v 1.42 2020/04/21 11:29:59 jaapb Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | .include "Makefile.common" | 4 | .include "Makefile.common" | |
5 | 5 | |||
6 | PKGNAME= ocaml-${DISTNAME} | 6 | PKGNAME= ocaml-${DISTNAME} | |
7 | CATEGORIES= devel | 7 | CATEGORIES= devel | |
8 | 8 | |||
9 | MAINTAINER= jaapb@NetBSD.org | 9 | MAINTAINER= jaapb@NetBSD.org | |
10 | HOMEPAGE= http://www.ocsigen.org/ | 10 | HOMEPAGE= http://www.ocsigen.org/ | |
11 | COMMENT= Cooperative threading library for OCaml | 11 | COMMENT= Cooperative threading library for OCaml | |
12 | 12 | |||
13 | OCAML_FINDLIB_DIRS= lwt stublibs | 13 | OCAML_FINDLIB_DIRS= lwt stublibs | |
14 | DUNE_BUILD_PACKAGES= lwt | 14 | DUNE_BUILD_PACKAGES= lwt | |
15 | 15 | |||
16 | CFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS | 16 | CFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS | |
17 | 17 | |||
18 | MAKE_ENV+= LWT_DISCOVER_ARGUMENTS="--use-pthread true --use-libev true --verbose" | |||
19 | ||||
18 | .include "../../mk/ocaml.mk" | 20 | .include "../../mk/ocaml.mk" | |
21 | .include "../../mk/pthread.buildlink3.mk" | |||
22 | .include "../../devel/libev/buildlink3.mk" | |||
19 | .include "../../devel/ocaml-cppo/buildlink3.mk" | 23 | .include "../../devel/ocaml-cppo/buildlink3.mk" | |
20 | .include "../../devel/ocaml-findlib/buildlink3.mk" | 24 | .include "../../devel/ocaml-findlib/buildlink3.mk" | |
21 | .include "../../devel/ocaml-migrate-parsetree/buildlink3.mk" | 25 | .include "../../devel/ocaml-migrate-parsetree/buildlink3.mk" | |
22 | .include "../../devel/ocaml-mmap/buildlink3.mk" | 26 | .include "../../devel/ocaml-mmap/buildlink3.mk" | |
27 | .include "../../devel/ocaml-ocplib-endian/buildlink3.mk" | |||
23 | .include "../../devel/ocaml-ppx_tools_versioned/buildlink3.mk" | 28 | .include "../../devel/ocaml-ppx_tools_versioned/buildlink3.mk" | |
24 | .include "../../devel/ocaml-result/buildlink3.mk" | 29 | .include "../../devel/ocaml-result/buildlink3.mk" | |
25 | .include "../../devel/ocaml-seq/buildlink3.mk" | 30 | .include "../../devel/ocaml-seq/buildlink3.mk" | |
26 | .include "../../mk/bsd.pkg.mk" | 31 | .include "../../mk/bsd.pkg.mk" |
@@ -1,19 +1,18 @@ | @@ -1,19 +1,18 @@ | |||
1 | # $NetBSD: Makefile.common,v 1.7 2019/05/13 11:38:45 jaapb Exp $ | 1 | # $NetBSD: Makefile.common,v 1.8 2020/04/21 11:29:59 jaapb Exp $ | |
2 | 2 | |||
3 | # used by devel/ocaml-lwt_glib/Makefile | |||
4 | # used by devel/ocaml-lwt_ppx/Makefile | 3 | # used by devel/ocaml-lwt_ppx/Makefile | |
5 | # used by devel/ocaml-lwt_react/Makefile | 4 | # used by devel/ocaml-lwt_react/Makefile | |
6 | 5 | |||
7 | LWT_VERSION= 4.2.1 | 6 | LWT_VERSION= 5.2.0 | |
8 | DISTNAME= lwt-${LWT_VERSION} | 7 | DISTNAME= lwt-${LWT_VERSION} | |
9 | 8 | |||
10 | LICENSE= mit | 9 | LICENSE= mit | |
11 | 10 | |||
12 | MASTER_SITES= ${MASTER_SITE_GITHUB:=ocsigen/} | 11 | MASTER_SITES= ${MASTER_SITE_GITHUB:=ocsigen/} | |
13 | GITHUB_PROJECT= lwt | 12 | GITHUB_PROJECT= lwt | |
14 | GITHUB_TAG= ${LWT_VERSION} | 13 | GITHUB_TAG= ${LWT_VERSION} | |
15 | 14 | |||
16 | OCAML_USE_DUNE= yes | 15 | OCAML_USE_DUNE= yes | |
17 | 16 | |||
18 | DISTINFO_FILE= ${PKGDIR}/../../devel/ocaml-lwt/distinfo | 17 | DISTINFO_FILE= ${PKGDIR}/../../devel/ocaml-lwt/distinfo | |
19 | PATCHDIR= ${PKGDIR}/../../devel/ocaml-lwt/patches | 18 | PATCHDIR= ${PKGDIR}/../../devel/ocaml-lwt/patches |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.17 2019/03/05 16:56:16 jaapb Exp $ | 1 | @comment $NetBSD: PLIST,v 1.18 2020/04/21 11:29:59 jaapb Exp $ | |
2 | ${OCAML_SITELIB}/lwt/META | 2 | ${OCAML_SITELIB}/lwt/META | |
3 | ${OCAML_SITELIB}/lwt/dune-package | 3 | ${OCAML_SITELIB}/lwt/dune-package | |
4 | ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt.a | 4 | ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt.a | |
5 | ${OCAML_SITELIB}/lwt/lwt.cma | 5 | ${OCAML_SITELIB}/lwt/lwt.cma | |
6 | ${OCAML_SITELIB}/lwt/lwt.cmi | 6 | ${OCAML_SITELIB}/lwt/lwt.cmi | |
7 | ${OCAML_SITELIB}/lwt/lwt.cmt | 7 | ${OCAML_SITELIB}/lwt/lwt.cmt | |
8 | ${OCAML_SITELIB}/lwt/lwt.cmti | 8 | ${OCAML_SITELIB}/lwt/lwt.cmti | |
9 | ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt.cmx | 9 | ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt.cmx | |
10 | ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt.cmxa | 10 | ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt.cmxa | |
11 | ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt.cmxs | 11 | ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt.cmxs | |
12 | ${OCAML_SITELIB}/lwt/lwt.ml | 12 | ${OCAML_SITELIB}/lwt/lwt.ml | |
13 | ${OCAML_SITELIB}/lwt/lwt.mli | 13 | ${OCAML_SITELIB}/lwt/lwt.mli | |
14 | ${OCAML_SITELIB}/lwt/lwt_condition.cmi | 14 | ${OCAML_SITELIB}/lwt/lwt_condition.cmi | |
@@ -80,26 +80,31 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/u | @@ -80,26 +80,31 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/u | |||
80 | ${OCAML_SITELIB}/lwt/unix/lwt_bytes.ml | 80 | ${OCAML_SITELIB}/lwt/unix/lwt_bytes.ml | |
81 | ${OCAML_SITELIB}/lwt/unix/lwt_bytes.mli | 81 | ${OCAML_SITELIB}/lwt/unix/lwt_bytes.mli | |
82 | ${OCAML_SITELIB}/lwt/unix/lwt_config.cmi | 82 | ${OCAML_SITELIB}/lwt/unix/lwt_config.cmi | |
83 | ${OCAML_SITELIB}/lwt/unix/lwt_config.cmt | 83 | ${OCAML_SITELIB}/lwt/unix/lwt_config.cmt | |
84 | ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_config.cmx | 84 | ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_config.cmx | |
85 | ${OCAML_SITELIB}/lwt/unix/lwt_config.h | 85 | ${OCAML_SITELIB}/lwt/unix/lwt_config.h | |
86 | ${OCAML_SITELIB}/lwt/unix/lwt_config.ml | 86 | ${OCAML_SITELIB}/lwt/unix/lwt_config.ml | |
87 | ${OCAML_SITELIB}/lwt/unix/lwt_engine.cmi | 87 | ${OCAML_SITELIB}/lwt/unix/lwt_engine.cmi | |
88 | ${OCAML_SITELIB}/lwt/unix/lwt_engine.cmt | 88 | ${OCAML_SITELIB}/lwt/unix/lwt_engine.cmt | |
89 | ${OCAML_SITELIB}/lwt/unix/lwt_engine.cmti | 89 | ${OCAML_SITELIB}/lwt/unix/lwt_engine.cmti | |
90 | ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_engine.cmx | 90 | ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_engine.cmx | |
91 | ${OCAML_SITELIB}/lwt/unix/lwt_engine.ml | 91 | ${OCAML_SITELIB}/lwt/unix/lwt_engine.ml | |
92 | ${OCAML_SITELIB}/lwt/unix/lwt_engine.mli | 92 | ${OCAML_SITELIB}/lwt/unix/lwt_engine.mli | |
93 | ${OCAML_SITELIB}/lwt/unix/lwt_features.cmi | |||
94 | ${OCAML_SITELIB}/lwt/unix/lwt_features.cmt | |||
95 | ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_features.cmx | |||
96 | ${OCAML_SITELIB}/lwt/unix/lwt_features.h | |||
97 | ${OCAML_SITELIB}/lwt/unix/lwt_features.ml | |||
93 | ${OCAML_SITELIB}/lwt/unix/lwt_fmt.cmi | 98 | ${OCAML_SITELIB}/lwt/unix/lwt_fmt.cmi | |
94 | ${OCAML_SITELIB}/lwt/unix/lwt_fmt.cmt | 99 | ${OCAML_SITELIB}/lwt/unix/lwt_fmt.cmt | |
95 | ${OCAML_SITELIB}/lwt/unix/lwt_fmt.cmti | 100 | ${OCAML_SITELIB}/lwt/unix/lwt_fmt.cmti | |
96 | ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_fmt.cmx | 101 | ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_fmt.cmx | |
97 | ${OCAML_SITELIB}/lwt/unix/lwt_fmt.ml | 102 | ${OCAML_SITELIB}/lwt/unix/lwt_fmt.ml | |
98 | ${OCAML_SITELIB}/lwt/unix/lwt_fmt.mli | 103 | ${OCAML_SITELIB}/lwt/unix/lwt_fmt.mli | |
99 | ${OCAML_SITELIB}/lwt/unix/lwt_gc.cmi | 104 | ${OCAML_SITELIB}/lwt/unix/lwt_gc.cmi | |
100 | ${OCAML_SITELIB}/lwt/unix/lwt_gc.cmt | 105 | ${OCAML_SITELIB}/lwt/unix/lwt_gc.cmt | |
101 | ${OCAML_SITELIB}/lwt/unix/lwt_gc.cmti | 106 | ${OCAML_SITELIB}/lwt/unix/lwt_gc.cmti | |
102 | ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_gc.cmx | 107 | ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_gc.cmx | |
103 | ${OCAML_SITELIB}/lwt/unix/lwt_gc.ml | 108 | ${OCAML_SITELIB}/lwt/unix/lwt_gc.ml | |
104 | ${OCAML_SITELIB}/lwt/unix/lwt_gc.mli | 109 | ${OCAML_SITELIB}/lwt/unix/lwt_gc.mli | |
105 | ${OCAML_SITELIB}/lwt/unix/lwt_io.cmi | 110 | ${OCAML_SITELIB}/lwt/unix/lwt_io.cmi | |
@@ -145,21 +150,18 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/u | @@ -145,21 +150,18 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/u | |||
145 | ${OCAML_SITELIB}/lwt/unix/lwt_timeout.ml | 150 | ${OCAML_SITELIB}/lwt/unix/lwt_timeout.ml | |
146 | ${OCAML_SITELIB}/lwt/unix/lwt_timeout.mli | 151 | ${OCAML_SITELIB}/lwt/unix/lwt_timeout.mli | |
147 | ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_unix.a | 152 | ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_unix.a | |
148 | ${OCAML_SITELIB}/lwt/unix/lwt_unix.cma | 153 | ${OCAML_SITELIB}/lwt/unix/lwt_unix.cma | |
149 | ${OCAML_SITELIB}/lwt/unix/lwt_unix.cmi | 154 | ${OCAML_SITELIB}/lwt/unix/lwt_unix.cmi | |
150 | ${OCAML_SITELIB}/lwt/unix/lwt_unix.cmt | 155 | ${OCAML_SITELIB}/lwt/unix/lwt_unix.cmt | |
151 | ${OCAML_SITELIB}/lwt/unix/lwt_unix.cmti | 156 | ${OCAML_SITELIB}/lwt/unix/lwt_unix.cmti | |
152 | ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_unix.cmx | 157 | ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_unix.cmx | |
153 | ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_unix.cmxa | 158 | ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_unix.cmxa | |
154 | ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_unix.cmxs | 159 | ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_unix.cmxs | |
155 | ${OCAML_SITELIB}/lwt/unix/lwt_unix.h | 160 | ${OCAML_SITELIB}/lwt/unix/lwt_unix.h | |
156 | ${OCAML_SITELIB}/lwt/unix/lwt_unix.ml | 161 | ${OCAML_SITELIB}/lwt/unix/lwt_unix.ml | |
157 | ${OCAML_SITELIB}/lwt/unix/lwt_unix.mli | 162 | ${OCAML_SITELIB}/lwt/unix/lwt_unix.mli | |
158 | ${OCAML_SITELIB}/lwt/unix/lwt_unix_jobs.cmi | |||
159 | ${OCAML_SITELIB}/lwt/unix/lwt_unix_jobs.cmt | |||
160 | ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_unix_jobs.cmx | |||
161 | ${OCAML_SITELIB}/lwt/unix/lwt_unix_jobs.ml | |||
162 | ${OCAML_SITELIB}/stublibs/dlllwt_unix_stubs.so | 163 | ${OCAML_SITELIB}/stublibs/dlllwt_unix_stubs.so | |
163 | share/doc/lwt/CHANGES | 164 | share/doc/lwt/CHANGES | |
164 | share/doc/lwt/LICENSE.md | 165 | share/doc/lwt/LICENSE.md | |
165 | share/doc/lwt/README.md | 166 | share/doc/lwt/README.md | |
167 | share/doc/lwt/odoc-pages/index.mld |
@@ -1,15 +1,15 @@ | @@ -1,15 +1,15 @@ | |||
1 | # $NetBSD: buildlink3.mk,v 1.14 2019/05/13 11:38:45 jaapb Exp $ | 1 | # $NetBSD: buildlink3.mk,v 1.15 2020/04/21 11:29:59 jaapb Exp $ | |
2 | 2 | |||
3 | BUILDLINK_TREE+= ocaml-lwt | 3 | BUILDLINK_TREE+= ocaml-lwt | |
4 | 4 | |||
5 | .if !defined(OCAML_LWT_BUILDLINK3_MK) | 5 | .if !defined(OCAML_LWT_BUILDLINK3_MK) | |
6 | OCAML_LWT_BUILDLINK3_MK:= | 6 | OCAML_LWT_BUILDLINK3_MK:= | |
7 | 7 | |||
8 | BUILDLINK_API_DEPENDS.ocaml-lwt+= ocaml-lwt>=4.0.0 | 8 | BUILDLINK_API_DEPENDS.ocaml-lwt+= ocaml-lwt>=5.0.0 | |
9 | BUILDLINK_ABI_DEPENDS.ocaml-lwt+= ocaml-lwt>=4.2.1 | 9 | BUILDLINK_ABI_DEPENDS.ocaml-lwt+= ocaml-lwt>=5.2.0 | |
10 | BUILDLINK_PKGSRCDIR.ocaml-lwt?= ../../devel/ocaml-lwt | 10 | BUILDLINK_PKGSRCDIR.ocaml-lwt?= ../../devel/ocaml-lwt | |
11 | 11 | |||
12 | #.include "../../devel/libev/buildlink3.mk" | 12 | #.include "../../devel/libev/buildlink3.mk" | |
13 | .endif # OCAML_LWT_BUILDLINK3_MK | 13 | .endif # OCAML_LWT_BUILDLINK3_MK | |
14 | 14 | |||
15 | BUILDLINK_TREE+= -ocaml-lwt | 15 | BUILDLINK_TREE+= -ocaml-lwt |
@@ -1,8 +1,8 @@ | @@ -1,8 +1,8 @@ | |||
1 | $NetBSD: distinfo,v 1.22 2019/05/13 11:38:45 jaapb Exp $ | 1 | $NetBSD: distinfo,v 1.23 2020/04/21 11:29:59 jaapb Exp $ | |
2 | 2 | |||
3 | SHA1 (lwt-4.2.1.tar.gz) = bba54c66d8c7dd7b09bc091ed33656276ce73b30 | 3 | SHA1 (lwt-5.2.0.tar.gz) = ccfc215289f33222ad08f3a83b3b5026b3510feb | |
4 | RMD160 (lwt-4.2.1.tar.gz) = ed70a120a8c2cf87985ef3153512b63959b60bec | 4 | RMD160 (lwt-5.2.0.tar.gz) = b7f3b5372bea3aacb3d7fd85481dd86e517dc733 | |
5 | SHA512 (lwt-4.2.1.tar.gz) = 4289568e9ca0ffc8625caddc0b5c7d79737800106289931927133eeeb79e3c638aad4399b075bf46b339e91a739589983ce546f4dad07f492fd31ce5be5c216d | 5 | SHA512 (lwt-5.2.0.tar.gz) = 361019d128bd2924cfa3251a5d8929b0ba85fc519c4c987ab0e3e2023dfc06cf376146941546abd2c03b6999bce0abf0de342507c1ac9674c2915b3b6f280707 | |
6 | Size (lwt-4.2.1.tar.gz) = 286694 bytes | 6 | Size (lwt-5.2.0.tar.gz) = 296289 bytes | |
7 | SHA1 (patch-src_unix_config_discover.ml) = ef8ea37d85f20d56654514617050ee46d6080ef1 | 7 | SHA1 (patch-src_react_dune) = 49e256b74876a11b75478a1ffc434ff2a6ec61ee | |
8 | SHA1 (patch-src_unix_unix__c_unix__stat__job__utils.c) = 5ec0ae3afe3d65e673681fcf8faeebf811e64518 | 8 | SHA1 (patch-src_unix_unix__c_unix__stat__job__utils.c) = ca86829f5330a26b5bc8514bf4081fa71b8b32d4 |
$NetBSD: patch-src_react_dune,v 1.1 2020/04/21 11:29:59 jaapb Exp $
bisect_ppx library not needed for release
--- src/react/dune.orig 2020-03-09 04:17:06.000000000 +0000
+++ src/react/dune
@@ -10,5 +10,4 @@
(synopsis "Reactive programming helpers for Lwt")
(wrapped false)
(libraries lwt react)
- (preprocess (pps bisect_ppx --conditional))
(flags (:standard -w +A)))
@@ -1,30 +1,14 @@ | @@ -1,30 +1,14 @@ | |||
1 | $NetBSD: patch-src_unix_unix__c_unix__stat__job__utils.c,v 1.1 2018/04/05 11:04:40 jaapb Exp $ | 1 | $NetBSD: patch-src_unix_unix__c_unix__stat__job__utils.c,v 1.2 2020/04/21 11:29:59 jaapb Exp $ | |
2 | 2 | |||
3 | Need limits.h for IOV_MAX. | 3 | Need limits.h for IOV_MAX. | |
4 | Avoid system NANOSEC definition. | |||
5 | 4 | |||
6 | --- src/unix/unix_c/unix_stat_job_utils.c.orig 2018-01-11 16:40:12.000000000 +0000 | 5 | --- src/unix/unix_c/unix_stat_job_utils.c.orig 2020-03-09 04:17:06.000000000 +0000 | |
7 | +++ src/unix/unix_c/unix_stat_job_utils.c | 6 | +++ src/unix/unix_c/unix_stat_job_utils.c | |
8 | @@ -28,6 +28,7 @@ | 7 | @@ -10,6 +10,7 @@ | |
9 | #include <caml/alloc.h> | 8 | #include <caml/alloc.h> | |
10 | #include <caml/memory.h> | 9 | #include <caml/memory.h> | |
11 | #include <errno.h> | 10 | #include <errno.h> | |
12 | +#include <limits.h> | 11 | +#include <limits.h> | |
13 | 12 | |||
14 | #include "unix_stat_job_utils.h" | 13 | #include "unix_stat_job_utils.h" | |
15 | 14 | |||
16 | @@ -37,11 +38,11 @@ value copy_stat(int use_64, struct stat | |||
17 | CAMLlocal5(atime, mtime, ctime, offset, v); | |||
18 | ||||
19 | atime = caml_copy_double((double)buf->st_atime + | |||
20 | - (NANOSEC(buf, a) / 1000000000.0)); | |||
21 | + (OCNANOSEC(buf, a) / 1000000000.0)); | |||
22 | mtime = caml_copy_double((double)buf->st_mtime + | |||
23 | - (NANOSEC(buf, m) / 1000000000.0)); | |||
24 | + (OCNANOSEC(buf, m) / 1000000000.0)); | |||
25 | ctime = caml_copy_double((double)buf->st_ctime + | |||
26 | - (NANOSEC(buf, c) / 1000000000.0)); | |||
27 | + (OCNANOSEC(buf, c) / 1000000000.0)); | |||
28 | offset = use_64 ? caml_copy_int64(buf->st_size) : Val_int(buf->st_size); | |||
29 | v = caml_alloc_small(12, 0); | |||
30 | Field(v, 0) = Val_int(buf->st_dev); |