pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/devel/ocaml-lwt
Module Name: pkgsrc
Committed By: jaapb
Date: Tue Apr 21 11:29:59 UTC 2020
Modified Files:
pkgsrc/devel/ocaml-lwt: Makefile Makefile.common PLIST buildlink3.mk
distinfo
pkgsrc/devel/ocaml-lwt/patches:
patch-src_unix_unix__c_unix__stat__job__utils.c
Added Files:
pkgsrc/devel/ocaml-lwt/patches: patch-src_react_dune
Removed Files:
pkgsrc/devel/ocaml-lwt/patches: patch-src_unix_config_discover.ml
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/devel/ocaml-lwt/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/ocaml-lwt/Makefile.common
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/ocaml-lwt/PLIST
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/ocaml-lwt/buildlink3.mk
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/ocaml-lwt/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/ocaml-lwt/patches/patch-src_react_dune
cvs rdiff -u -r1.1 -r0 \
pkgsrc/devel/ocaml-lwt/patches/patch-src_unix_config_discover.ml
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/devel/ocaml-lwt/patches/patch-src_unix_unix__c_unix__stat__job__utils.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/devel/ocaml-lwt/Makefile
diff -u pkgsrc/devel/ocaml-lwt/Makefile:1.41 pkgsrc/devel/ocaml-lwt/Makefile:1.42
--- pkgsrc/devel/ocaml-lwt/Makefile:1.41 Mon May 13 11:38:45 2019
+++ pkgsrc/devel/ocaml-lwt/Makefile Tue Apr 21 11:29:59 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2019/05/13 11:38:45 jaapb Exp $
+# $NetBSD: Makefile,v 1.42 2020/04/21 11:29:59 jaapb Exp $
#
.include "Makefile.common"
@@ -15,11 +15,16 @@ DUNE_BUILD_PACKAGES= lwt
CFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS
+MAKE_ENV+= LWT_DISCOVER_ARGUMENTS="--use-pthread true --use-libev true --verbose"
+
.include "../../mk/ocaml.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../devel/libev/buildlink3.mk"
.include "../../devel/ocaml-cppo/buildlink3.mk"
.include "../../devel/ocaml-findlib/buildlink3.mk"
.include "../../devel/ocaml-migrate-parsetree/buildlink3.mk"
.include "../../devel/ocaml-mmap/buildlink3.mk"
+.include "../../devel/ocaml-ocplib-endian/buildlink3.mk"
.include "../../devel/ocaml-ppx_tools_versioned/buildlink3.mk"
.include "../../devel/ocaml-result/buildlink3.mk"
.include "../../devel/ocaml-seq/buildlink3.mk"
Index: pkgsrc/devel/ocaml-lwt/Makefile.common
diff -u pkgsrc/devel/ocaml-lwt/Makefile.common:1.7 pkgsrc/devel/ocaml-lwt/Makefile.common:1.8
--- pkgsrc/devel/ocaml-lwt/Makefile.common:1.7 Mon May 13 11:38:45 2019
+++ pkgsrc/devel/ocaml-lwt/Makefile.common Tue Apr 21 11:29:59 2020
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile.common,v 1.7 2019/05/13 11:38:45 jaapb Exp $
+# $NetBSD: Makefile.common,v 1.8 2020/04/21 11:29:59 jaapb Exp $
-# used by devel/ocaml-lwt_glib/Makefile
# used by devel/ocaml-lwt_ppx/Makefile
# used by devel/ocaml-lwt_react/Makefile
-LWT_VERSION= 4.2.1
+LWT_VERSION= 5.2.0
DISTNAME= lwt-${LWT_VERSION}
LICENSE= mit
Index: pkgsrc/devel/ocaml-lwt/PLIST
diff -u pkgsrc/devel/ocaml-lwt/PLIST:1.17 pkgsrc/devel/ocaml-lwt/PLIST:1.18
--- pkgsrc/devel/ocaml-lwt/PLIST:1.17 Tue Mar 5 16:56:16 2019
+++ pkgsrc/devel/ocaml-lwt/PLIST Tue Apr 21 11:29:59 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2019/03/05 16:56:16 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.18 2020/04/21 11:29:59 jaapb Exp $
${OCAML_SITELIB}/lwt/META
${OCAML_SITELIB}/lwt/dune-package
${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt.a
@@ -90,6 +90,11 @@ ${OCAML_SITELIB}/lwt/unix/lwt_engine.cmt
${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_engine.cmx
${OCAML_SITELIB}/lwt/unix/lwt_engine.ml
${OCAML_SITELIB}/lwt/unix/lwt_engine.mli
+${OCAML_SITELIB}/lwt/unix/lwt_features.cmi
+${OCAML_SITELIB}/lwt/unix/lwt_features.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_features.cmx
+${OCAML_SITELIB}/lwt/unix/lwt_features.h
+${OCAML_SITELIB}/lwt/unix/lwt_features.ml
${OCAML_SITELIB}/lwt/unix/lwt_fmt.cmi
${OCAML_SITELIB}/lwt/unix/lwt_fmt.cmt
${OCAML_SITELIB}/lwt/unix/lwt_fmt.cmti
@@ -155,11 +160,8 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/u
${OCAML_SITELIB}/lwt/unix/lwt_unix.h
${OCAML_SITELIB}/lwt/unix/lwt_unix.ml
${OCAML_SITELIB}/lwt/unix/lwt_unix.mli
-${OCAML_SITELIB}/lwt/unix/lwt_unix_jobs.cmi
-${OCAML_SITELIB}/lwt/unix/lwt_unix_jobs.cmt
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_unix_jobs.cmx
-${OCAML_SITELIB}/lwt/unix/lwt_unix_jobs.ml
${OCAML_SITELIB}/stublibs/dlllwt_unix_stubs.so
share/doc/lwt/CHANGES
share/doc/lwt/LICENSE.md
share/doc/lwt/README.md
+share/doc/lwt/odoc-pages/index.mld
Index: pkgsrc/devel/ocaml-lwt/buildlink3.mk
diff -u pkgsrc/devel/ocaml-lwt/buildlink3.mk:1.14 pkgsrc/devel/ocaml-lwt/buildlink3.mk:1.15
--- pkgsrc/devel/ocaml-lwt/buildlink3.mk:1.14 Mon May 13 11:38:45 2019
+++ pkgsrc/devel/ocaml-lwt/buildlink3.mk Tue Apr 21 11:29:59 2020
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.14 2019/05/13 11:38:45 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2020/04/21 11:29:59 jaapb Exp $
BUILDLINK_TREE+= ocaml-lwt
.if !defined(OCAML_LWT_BUILDLINK3_MK)
OCAML_LWT_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.ocaml-lwt+= ocaml-lwt>=4.0.0
-BUILDLINK_ABI_DEPENDS.ocaml-lwt+= ocaml-lwt>=4.2.1
+BUILDLINK_API_DEPENDS.ocaml-lwt+= ocaml-lwt>=5.0.0
+BUILDLINK_ABI_DEPENDS.ocaml-lwt+= ocaml-lwt>=5.2.0
BUILDLINK_PKGSRCDIR.ocaml-lwt?= ../../devel/ocaml-lwt
#.include "../../devel/libev/buildlink3.mk"
Index: pkgsrc/devel/ocaml-lwt/distinfo
diff -u pkgsrc/devel/ocaml-lwt/distinfo:1.22 pkgsrc/devel/ocaml-lwt/distinfo:1.23
--- pkgsrc/devel/ocaml-lwt/distinfo:1.22 Mon May 13 11:38:45 2019
+++ pkgsrc/devel/ocaml-lwt/distinfo Tue Apr 21 11:29:59 2020
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.22 2019/05/13 11:38:45 jaapb Exp $
+$NetBSD: distinfo,v 1.23 2020/04/21 11:29:59 jaapb Exp $
-SHA1 (lwt-4.2.1.tar.gz) = bba54c66d8c7dd7b09bc091ed33656276ce73b30
-RMD160 (lwt-4.2.1.tar.gz) = ed70a120a8c2cf87985ef3153512b63959b60bec
-SHA512 (lwt-4.2.1.tar.gz) = 4289568e9ca0ffc8625caddc0b5c7d79737800106289931927133eeeb79e3c638aad4399b075bf46b339e91a739589983ce546f4dad07f492fd31ce5be5c216d
-Size (lwt-4.2.1.tar.gz) = 286694 bytes
-SHA1 (patch-src_unix_config_discover.ml) = ef8ea37d85f20d56654514617050ee46d6080ef1
-SHA1 (patch-src_unix_unix__c_unix__stat__job__utils.c) = 5ec0ae3afe3d65e673681fcf8faeebf811e64518
+SHA1 (lwt-5.2.0.tar.gz) = ccfc215289f33222ad08f3a83b3b5026b3510feb
+RMD160 (lwt-5.2.0.tar.gz) = b7f3b5372bea3aacb3d7fd85481dd86e517dc733
+SHA512 (lwt-5.2.0.tar.gz) = 361019d128bd2924cfa3251a5d8929b0ba85fc519c4c987ab0e3e2023dfc06cf376146941546abd2c03b6999bce0abf0de342507c1ac9674c2915b3b6f280707
+Size (lwt-5.2.0.tar.gz) = 296289 bytes
+SHA1 (patch-src_react_dune) = 49e256b74876a11b75478a1ffc434ff2a6ec61ee
+SHA1 (patch-src_unix_unix__c_unix__stat__job__utils.c) = ca86829f5330a26b5bc8514bf4081fa71b8b32d4
Index: pkgsrc/devel/ocaml-lwt/patches/patch-src_unix_unix__c_unix__stat__job__utils.c
diff -u pkgsrc/devel/ocaml-lwt/patches/patch-src_unix_unix__c_unix__stat__job__utils.c:1.1 pkgsrc/devel/ocaml-lwt/patches/patch-src_unix_unix__c_unix__stat__job__utils.c:1.2
--- pkgsrc/devel/ocaml-lwt/patches/patch-src_unix_unix__c_unix__stat__job__utils.c:1.1 Thu Apr 5 11:04:40 2018
+++ pkgsrc/devel/ocaml-lwt/patches/patch-src_unix_unix__c_unix__stat__job__utils.c Tue Apr 21 11:29:59 2020
@@ -1,11 +1,10 @@
-$NetBSD: patch-src_unix_unix__c_unix__stat__job__utils.c,v 1.1 2018/04/05 11:04:40 jaapb Exp $
+$NetBSD: patch-src_unix_unix__c_unix__stat__job__utils.c,v 1.2 2020/04/21 11:29:59 jaapb Exp $
Need limits.h for IOV_MAX.
-Avoid system NANOSEC definition.
---- src/unix/unix_c/unix_stat_job_utils.c.orig 2018-01-11 16:40:12.000000000 +0000
+--- src/unix/unix_c/unix_stat_job_utils.c.orig 2020-03-09 04:17:06.000000000 +0000
+++ src/unix/unix_c/unix_stat_job_utils.c
-@@ -28,6 +28,7 @@
+@@ -10,6 +10,7 @@
#include <caml/alloc.h>
#include <caml/memory.h>
#include <errno.h>
@@ -13,18 +12,3 @@ Avoid system NANOSEC definition.
#include "unix_stat_job_utils.h"
-@@ -37,11 +38,11 @@ value copy_stat(int use_64, struct stat
- CAMLlocal5(atime, mtime, ctime, offset, v);
-
- atime = caml_copy_double((double)buf->st_atime +
-- (NANOSEC(buf, a) / 1000000000.0));
-+ (OCNANOSEC(buf, a) / 1000000000.0));
- mtime = caml_copy_double((double)buf->st_mtime +
-- (NANOSEC(buf, m) / 1000000000.0));
-+ (OCNANOSEC(buf, m) / 1000000000.0));
- ctime = caml_copy_double((double)buf->st_ctime +
-- (NANOSEC(buf, c) / 1000000000.0));
-+ (OCNANOSEC(buf, c) / 1000000000.0));
- offset = use_64 ? caml_copy_int64(buf->st_size) : Val_int(buf->st_size);
- v = caml_alloc_small(12, 0);
- Field(v, 0) = Val_int(buf->st_dev);
Added files:
Index: pkgsrc/devel/ocaml-lwt/patches/patch-src_react_dune
diff -u /dev/null pkgsrc/devel/ocaml-lwt/patches/patch-src_react_dune:1.1
--- /dev/null Tue Apr 21 11:29:59 2020
+++ pkgsrc/devel/ocaml-lwt/patches/patch-src_react_dune Tue Apr 21 11:29:59 2020
@@ -0,0 +1,12 @@
+$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)))
Home |
Main Index |
Thread Index |
Old Index