pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/lang/ocaml
Module Name: pkgsrc
Committed By: jaapb
Date: Sat Aug 24 10:54:24 UTC 2019
Modified Files:
pkgsrc/lang/ocaml: Makefile Makefile.common PLIST buildlink3.mk
distinfo hacks.mk options.mk
pkgsrc/lang/ocaml/patches: patch-Makefile patch-asmcomp_amd64_emit.mlp
patch-asmrun_amd64.S patch-configure patch-driver_compenv.ml
patch-otherlibs_systhreads_Makefile
patch-otherlibs_threads_Makefile patch-tools_ocamlmklib
patch-yacc_Makefile
Added Files:
pkgsrc/lang/ocaml/patches: patch-Makefile.common.in patch-lex_Makefile
patch-ocamldoc_Makefile patch-otherlibs_Makefile.otherlibs.common
patch-runtime_Makefile patch-tools_Makefile
Log Message:
Updated lang/ocaml to 4.08.1.
4.08.1 is a bugfix release, fixing compilation failures in presence of the
-pack option, and dynlinking failures.
Highlights in 4.08.0 are:
* Binding operators (let*, let+, and*, etc). They can be used to
streamline monadic code.
* open now applies to arbitrary module expression in structures and to
applicative paths in signatures.
* A new notion of (user-defined) "alerts" generalizes the deprecated
warning.
* New modules in the standard library: Fun, Bool, Int, Option, Result.
* A significant number of new functions in Float, including FMA support,
and a new Float.Array submodule.
* Source highlighting for errors and warnings in batch mode.
* Many error messages were improved.
* Improved AFL instrumentation for objects and lazy values.
To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 pkgsrc/lang/ocaml/Makefile \
pkgsrc/lang/ocaml/distinfo
cvs rdiff -u -r1.55 -r1.56 pkgsrc/lang/ocaml/Makefile.common
cvs rdiff -u -r1.50 -r1.51 pkgsrc/lang/ocaml/PLIST
cvs rdiff -u -r1.51 -r1.52 pkgsrc/lang/ocaml/buildlink3.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/ocaml/hacks.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/ocaml/options.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/ocaml/patches/patch-Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/ocaml/patches/patch-Makefile.common.in \
pkgsrc/lang/ocaml/patches/patch-lex_Makefile \
pkgsrc/lang/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common \
pkgsrc/lang/ocaml/patches/patch-runtime_Makefile \
pkgsrc/lang/ocaml/patches/patch-tools_Makefile
cvs rdiff -u -r1.3 -r1.4 \
pkgsrc/lang/ocaml/patches/patch-asmcomp_amd64_emit.mlp \
pkgsrc/lang/ocaml/patches/patch-driver_compenv.ml \
pkgsrc/lang/ocaml/patches/patch-yacc_Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/ocaml/patches/patch-asmrun_amd64.S
cvs rdiff -u -r1.36 -r1.37 pkgsrc/lang/ocaml/patches/patch-configure
cvs rdiff -u -r0 -r1.7 pkgsrc/lang/ocaml/patches/patch-ocamldoc_Makefile
cvs rdiff -u -r1.9 -r1.10 \
pkgsrc/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile
cvs rdiff -u -r1.12 -r1.13 \
pkgsrc/lang/ocaml/patches/patch-otherlibs_threads_Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/ocaml/patches/patch-tools_ocamlmklib
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/lang/ocaml/Makefile
diff -u pkgsrc/lang/ocaml/Makefile:1.126 pkgsrc/lang/ocaml/Makefile:1.127
--- pkgsrc/lang/ocaml/Makefile:1.126 Fri Aug 2 03:13:06 2019
+++ pkgsrc/lang/ocaml/Makefile Sat Aug 24 10:54:23 2019
@@ -1,19 +1,19 @@
-# $NetBSD: Makefile,v 1.126 2019/08/02 03:13:06 schmonz Exp $
+# $NetBSD: Makefile,v 1.127 2019/08/24 10:54:23 jaapb Exp $
.include "Makefile.common"
-PKGREVISION= 4
-
-CONFIGURE_ENV+= disable_x11=yes
+#CONFIGURE_ENV+= disable_x11=yes
BUILD_TARGET= world
MAKE_JOBS_SAFE= no
UNLIMIT_RESOURCES= stacksize
USE_TOOLS+= bash
-USE_FEATURES+= strnlen
+USE_LANGUAGES+= c
+USE_LIBTOOL= yes
+USE_GNU_CONFIGURE_HOST= no
-USE_GCC_RUNTIME= yes
+#USE_GCC_RUNTIME= yes
PLIST_VARS+= ocaml-stub ocaml-prof ocaml-opt ocaml-nat ocaml-spacetime \
instrumented_runtime
@@ -37,13 +37,12 @@ PLIST.ocaml-stub= yes
.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
!empty(MACHINE_ARCH:M*arm*) || (${MACHINE_ARCH} == "aarch64") || \
(${MACHINE_ARCH} == "x86_64")
-BUILD_TARGET+= opt opt.opt
+BUILD_TARGET+= opt opt.opt
PLIST.ocaml-opt= yes
. if empty(MACHINE_PLATFORM:MDarwin-*-powerpc) && \
empty(MACHINE_PLATFORM:MSunOS-*-i386) && \
- empty(MACHINE_PLATFORM:MNetBSD-*-sparc) && \
(${MACHINE_ARCH} != "aarch64")
-PLIST.ocaml-prof=yes
+PLIST.ocaml-prof= yes
. endif
.endif
@@ -57,20 +56,20 @@ PLIST.ocaml-prof=yes
(!empty(MACHINE_PLATFORM:MNetBSD-*-*) && empty(MACHINE_PLATFORM:MNetBSD-*-powerpc)) || \
!empty(MACHINE_PLATFORM:MDarwin-*-*) || \
!empty(MACHINE_PLATFORM:MSunOS-*-*)
-PLIST.ocaml-nat= yes
+PLIST.ocaml-nat= yes
. endif
.endif
# Spacetime profiling is only available for native code on 64-bit targets.
.if (${MACHINE_ARCH} == "x86_64") || (${MACHINE_ARCH} == "aarch64")
-PLIST.ocaml-spacetime= yes
+PLIST.ocaml-spacetime= yes
.endif
# clock_gettime(2), required by POSIX, is necessary for the
# instrumented_runtime feature.
# It is missing on macOS before 10.12.
.if ${OPSYS} != "Darwin" || ${OS_VERSION:R:R} >= 16
-PLIST.instrumented_runtime=yes
+PLIST.instrumented_runtime= yes
.endif
# This is needed because ${WRKSRC}/build/partial-install.sh uses
@@ -84,7 +83,7 @@ PLIST.instrumented_runtime=yes
INSTALL_MAKE_FLAGS+= SHELL=${SH:Q}
.endif
-INSTALLATION_DIRS= ${PKGMANDIR}/man1
+#INSTALLATION_DIRS= ${PKGMANDIR}/man1
OPSYSVARS+= EXTRA_RT_LIBS
EXTRA_RT_LIBS.NetBSD= -lcurses
@@ -100,18 +99,12 @@ REPLACE_AWK+= tools/ocaml-instr-report
do-test:
cd ${WRKSRC}/testsuite && ${MAKE_PROGRAM} all
-post-install:
- set -e ; cd ${DESTDIR}${PREFIX}/lib/ocaml/${PKGMANDIR}/man1; \
- for m in *; do \
- ln -sf ${PREFIX}/lib/ocaml/${PKGMANDIR}/man1/$$m \
- ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/$$m; \
- done
-.if ${OPSYS} == Darwin
- set -e; cd ${DESTDIR}${PREFIX}/lib/ocaml; \
- for l in *.so */*.so; do \
- install_name_tool -id ${PREFIX}/lib/ocaml/$${l} $${l}; \
- done
-.endif
+#post-install:
+# set -e ; cd ${DESTDIR}${PREFIX}/lib/ocaml/${PKGMANDIR}/man1; \
+# for m in *; do \
+# ln -sf ${PREFIX}/lib/ocaml/${PKGMANDIR}/man1/$$m \
+# ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/$$m; \
+# done
.include "../../mk/dlopen.buildlink3.mk"
.include "../../mk/termcap.buildlink3.mk"
Index: pkgsrc/lang/ocaml/distinfo
diff -u pkgsrc/lang/ocaml/distinfo:1.126 pkgsrc/lang/ocaml/distinfo:1.127
--- pkgsrc/lang/ocaml/distinfo:1.126 Wed May 15 09:39:21 2019
+++ pkgsrc/lang/ocaml/distinfo Sat Aug 24 10:54:23 2019
@@ -1,29 +1,35 @@
-$NetBSD: distinfo,v 1.126 2019/05/15 09:39:21 jaapb Exp $
+$NetBSD: distinfo,v 1.127 2019/08/24 10:54:23 jaapb Exp $
-SHA1 (ocaml-4.07.1.tar.gz) = 55b9f90603f43cd84abba4db6f3a05a6040c505a
-RMD160 (ocaml-4.07.1.tar.gz) = d856a2fe78f52f06993f8ebc27715369d6317a54
-SHA512 (ocaml-4.07.1.tar.gz) = a7faed1759f76b91afb0922de159240cc11d68f89e2136d2f3add4d3e66fe923f27a094a937a7d7e73727a1675864e8ff41882eeaa4212d8c4dfeb2811e1707a
-Size (ocaml-4.07.1.tar.gz) = 4215856 bytes
-SHA1 (patch-Makefile) = c117fc5d17f9c81814acb92ba10d94f7a0d4cf69
+SHA1 (ocaml-4.08.1.tar.gz) = f89ae7513ee4f064c7db92066f9dd4ac085634e2
+RMD160 (ocaml-4.08.1.tar.gz) = a8c0b80d9b6ff52c9a5725eec3ce64adffd81ca6
+SHA512 (ocaml-4.08.1.tar.gz) = 8239c1879926e59c3d9611ad0d97618ce21b0528f1bd59db3df9c24287ad180ffa74f34e52e1fab39e71cbf8113a9a4ee5037cc33ae64ca6a9a109fe4ada0256
+Size (ocaml-4.08.1.tar.gz) = 4897908 bytes
+SHA1 (patch-Makefile) = 3c1410ba28d7d25ffd8fd4b1ffeef7f0206ec58d
SHA1 (patch-Makefile.common) = f7e1d1dbebf91679338c192ffc62c83cd0f2d17e
-SHA1 (patch-asmcomp_amd64_emit.mlp) = 68cc42afd6439347524f2d81c48305dcbc173869
+SHA1 (patch-Makefile.common.in) = bc44846bfa941520b43538189dbc5637c342ef0a
+SHA1 (patch-asmcomp_amd64_emit.mlp) = 1bc44434fbe1821d3aa2eed1a6b0938258586851
SHA1 (patch-asmcomp_asmlink.ml) = db2b387ea17f41a62c2bce53b91f945d5e29a82f
-SHA1 (patch-asmrun_amd64.S) = 4be1058a241e03ff73cd08d2aa16b0134c4414ca
+SHA1 (patch-asmrun_amd64.S) = 68d8f3ba1c1ad951e688539b4659aee71a527222
SHA1 (patch-byterun_Makefile) = 28f8a9fff06ae99c52213ba2202d5b99b67f6735
-SHA1 (patch-configure) = 8518862bf90ff38beca618c9af9411212e956af5
-SHA1 (patch-driver_compenv.ml) = 658e315bb08f8a1093f11c8474ac1e4ad73c8306
+SHA1 (patch-configure) = 6e204c6feea752c182043ecde52e421f60173e11
+SHA1 (patch-driver_compenv.ml) = 27c68072bd73c9c00d2b3093d8c6498f192ca3d3
SHA1 (patch-driver_main.ml) = 69a6f761ded38e0721a7aed1416a9f19a288d991
SHA1 (patch-driver_main_args.ml) = 4c6a6ec25f433974f9aab99b4f2ac9c884bb3b04
SHA1 (patch-driver_main_args.mli) = 5e8164e4392c0dde6c6264eeed87c346128e1863
SHA1 (patch-driver_optmain.ml) = 5ce77f1f906ce59cb533b4d25e4d57f7a70ab1b3
+SHA1 (patch-lex_Makefile) = 9c3de0a77dbea117b5587cfd77bbdcb3e2db26b6
SHA1 (patch-man_Makefile) = b780c026aef5f7e6b22b142fce3ec87ef9d2ab22
+SHA1 (patch-ocamldoc_Makefile) = 7f0a90ca7849447b93ae4b3fcbc58901de1e996f
SHA1 (patch-ocamldoc_odoc__messages.ml) = 77f650a5f34f40b9648a8d5091e9aa31efb5734b
SHA1 (patch-otherlibs_Makefile) = 9f8b8ab3fcd72d77b750040d6484b0ad4fca7a61
-SHA1 (patch-otherlibs_systhreads_Makefile) = 01a188ceac6df2c90c506ec020ae74bbbeb58888
-SHA1 (patch-otherlibs_threads_Makefile) = a2f32f2f2c124a8cfdbda245119f56a3486f36ec
+SHA1 (patch-otherlibs_Makefile.otherlibs.common) = 2eb71de7bd659c763fb7efdf10af1812e135c904
+SHA1 (patch-otherlibs_systhreads_Makefile) = d6f7818487c156b101b6a78f0dc2824d57453e50
+SHA1 (patch-otherlibs_threads_Makefile) = 3ccc89021d808967bc958d295515ceca1c39c81d
+SHA1 (patch-runtime_Makefile) = 37b8e9b8d121b9066ccd38ce18a31f8d25369152
+SHA1 (patch-tools_Makefile) = e891408b43672b164a28f213713b7b211227a4af
SHA1 (patch-tools_ocamlcp.ml) = 76dfe040e6d61f0c844e01fa2bd9b6b0f1c21b99
-SHA1 (patch-tools_ocamlmklib) = 53785aa5f0684a2c8708891d7e4e9d4400afbe7d
+SHA1 (patch-tools_ocamlmklib) = 9a9c0e3b473f7ba4127fe120cf6dbbdbb3c957f2
SHA1 (patch-tools_ocamloptp.ml) = 070bd797fcd4120e58d15a09f25d93ec46b87d1a
SHA1 (patch-utils_clflags.ml) = 1c8223caac3c81b134b470d9bb2fb5ce62576c53
SHA1 (patch-utils_clflags.mli) = 381951d9583e032d3a520b68a8fe9f867ec49995
-SHA1 (patch-yacc_Makefile) = e06c2598af621f50b9db2a511179e2b1cdbc4643
+SHA1 (patch-yacc_Makefile) = d3a2f606e05f6a58170cf4bad4f3321e54b4324b
Index: pkgsrc/lang/ocaml/Makefile.common
diff -u pkgsrc/lang/ocaml/Makefile.common:1.55 pkgsrc/lang/ocaml/Makefile.common:1.56
--- pkgsrc/lang/ocaml/Makefile.common:1.55 Mon Nov 12 16:09:34 2018
+++ pkgsrc/lang/ocaml/Makefile.common Sat Aug 24 10:54:23 2019
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile.common,v 1.55 2018/11/12 16:09:34 jaapb Exp $
+# $NetBSD: Makefile.common,v 1.56 2019/08/24 10:54:23 jaapb Exp $
# used by x11/labltk/Makefile
-# used by x11/ocaml-graphics/Makefile
-DISTNAME= ocaml-4.07.1
+DISTNAME= ocaml-4.08.1
CATEGORIES= lang
-MASTER_SITES= http://caml.inria.fr/pub/distrib/ocaml-4.07/
+MASTER_SITES= http://caml.inria.fr/pub/distrib/ocaml-4.08/
#EXTRACT_SUFX= .tar.bz2
MAINTAINER= jaapb%NetBSD.org@localhost
@@ -12,19 +11,21 @@ HOMEPAGE= https://ocaml.org/
COMMENT= The latest implementation of the Caml dialect of ML
LICENSE= gnu-gpl-v2
+USE_LANGUAGES+= c99
USE_TOOLS+= gmake
-HAS_CONFIGURE= yes
-CONFIGURE_ENV+= BDB_LIBS=${BDB_LINK:Q}
-CONFIGURE_ENV+= BDB_BUILTIN=${USE_BUILTIN.${BDB_TYPE}:Q}
-CONFIGURE_ARGS+= -prefix ${PREFIX}
-CONFIGURE_ARGS+= -libs ${LDFLAGS:Q}
-CONFIGURE_ARGS+= -with-pthread
-CONFIGURE_ARGS+= -host ${MACHINE_GNU_PLATFORM:Q}
-CONFIGURE_ARGS+= -mandir ${PREFIX}/lib/ocaml/${PKGMANDIR}
-CPPFLAGS+= -DDB_DBM_HSEARCH
+GNU_CONFIGURE= yes
+#CONFIGURE_ENV+= BDB_LIBS=${BDB_LINK:Q}
+#CONFIGURE_ENV+= BDB_BUILTIN=${USE_BUILTIN.${BDB_TYPE}:Q}
+#CONFIGURE_ENV+= LDFLAGS=${LDFLAGS:Q}
+#CONFIGURE_ARGS+= -prefix ${PREFIX}
+#CONFIGURE_ARGS+= -with-pthread
+#CONFIGURE_ARGS+= -host ${MACHINE_GNU_PLATFORM:Q}
+#CONFIGURE_ARGS+= -mandir ${PREFIX}/lib/ocaml/${PKGMANDIR}
+CONFIGURE_ARGS+= --without-x
+#CPPFLAGS+= -DDB_DBM_HSEARCH
-DISTINFO_FILE= ${.CURDIR}/../../lang/ocaml/distinfo
-PATCHDIR= ${.CURDIR}/../../lang/ocaml/patches
+#DISTINFO_FILE= ${.CURDIR}/../../lang/ocaml/distinfo
+#PATCHDIR= ${.CURDIR}/../../lang/ocaml/patches
.include "../../mk/bsd.prefs.mk"
@@ -32,26 +33,26 @@ PATCHDIR= ${.CURDIR}/../../lang/ocaml/pa
INSTALL_UNSTRIPPED= yes
.endif
-.if ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+= -cc "${CC} -arch ${MACHINE_ARCH} ${CFLAGS}"
-CONFIGURE_ARGS+= -aspp "${CC} -arch ${MACHINE_ARCH} -c"
-CONFIGURE_ARGS+= -as "as -arch ${MACHINE_ARCH}"
-.else
-CONFIGURE_ARGS+= -cc "${CC} ${CFLAGS}"
-.endif
+#.if ${OPSYS} == "Darwin"
+#CONFIGURE_ENV+= CC="${CC} -arch ${MACHINE_ARCH} ${CFLAGS}"
+#CONFIGURE_ENV+= ASPP="${CC} -arch ${MACHINE_ARCH} -c"
+#CONFIGURE_ENV+= AS="as -arch ${MACHINE_ARCH}"
+#.else
+#CONFIGURE_ENV+= CC="${CC} ${CFLAGS}"
+#.endif
.include "../../mk/bdb.buildlink3.mk"
-BDB_LINK= ${BDB_LIBS}
-.if empty(BDBBASE:M/usr)
-BDB_LINK+= -L${BDBBASE}/lib ${COMPILER_RPATH_FLAG}${BDBBASE}/lib
-.endif
-
-post-extract: cp-gnu-config
-
-.PHONY: cp-gnu-config
-cp-gnu-config:
- ${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/config/gnu/
- ${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/config/gnu/
+#BDB_LINK= ${BDB_LIBS}
+#.if empty(BDBBASE:M/usr)
+#BDB_LINK+= -L${BDBBASE}/lib ${COMPILER_RPATH_FLAG}${BDBBASE}/lib
+#.endif
+
+#post-extract: cp-gnu-config
+
+#.PHONY: cp-gnu-config
+#cp-gnu-config:
+# ${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/config/gnu/
+# ${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/config/gnu/
.include "../../mk/pthread.buildlink3.mk"
Index: pkgsrc/lang/ocaml/PLIST
diff -u pkgsrc/lang/ocaml/PLIST:1.50 pkgsrc/lang/ocaml/PLIST:1.51
--- pkgsrc/lang/ocaml/PLIST:1.50 Tue May 14 15:34:16 2019
+++ pkgsrc/lang/ocaml/PLIST Sat Aug 24 10:54:23 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.50 2019/05/14 15:34:16 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.51 2019/08/24 10:54:23 jaapb Exp $
bin/ocaml
${PLIST.instrumented_runtime}bin/ocaml-instr-graph
${PLIST.instrumented_runtime}bin/ocaml-instr-report
@@ -54,9 +54,11 @@ lib/ocaml/bigarray.cmi
lib/ocaml/bigarray.cmti
${PLIST.ocaml-opt}lib/ocaml/bigarray.cmx
${PLIST.ocaml-opt}lib/ocaml/bigarray.cmxa
-${PLIST.ocaml-opt}lib/ocaml/bigarray.cmxs
+${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/ocaml/bigarray.cmxs
lib/ocaml/bigarray.ml
lib/ocaml/bigarray.mli
+lib/ocaml/bool.ml
+lib/ocaml/bool.mli
lib/ocaml/buffer.ml
lib/ocaml/buffer.mli
lib/ocaml/bytes.ml
@@ -185,10 +187,12 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-lib
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/alias_analysis.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/alias_analysis.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/alias_analysis.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/alias_analysis.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/alias_analysis.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/allocated_const.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/allocated_const.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/allocated_const.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/allocated_const.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/allocated_const.mli
lib/ocaml/compiler-libs/annot.cmi
lib/ocaml/compiler-libs/annot.cmti
@@ -252,10 +256,16 @@ lib/ocaml/compiler-libs/attr_helper.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/augment_specialised_args.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/augment_specialised_args.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/augment_specialised_args.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/augment_specialised_args.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/augment_specialised_args.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/backend_intf.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/backend_intf.cmti
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/backend_intf.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/backend_var.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/backend_var.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/backend_var.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/backend_var.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/backend_var.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/branch_relaxation.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/branch_relaxation.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/branch_relaxation.cmti
@@ -309,6 +319,11 @@ lib/ocaml/compiler-libs/bytesections.cmt
lib/ocaml/compiler-libs/bytesections.cmti
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/bytesections.cmx
lib/ocaml/compiler-libs/bytesections.mli
+lib/ocaml/compiler-libs/camlinternalMenhirLib.cmi
+lib/ocaml/compiler-libs/camlinternalMenhirLib.cmt
+lib/ocaml/compiler-libs/camlinternalMenhirLib.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/camlinternalMenhirLib.cmx
+lib/ocaml/compiler-libs/camlinternalMenhirLib.mli
lib/ocaml/compiler-libs/ccomp.cmi
lib/ocaml/compiler-libs/ccomp.cmt
lib/ocaml/compiler-libs/ccomp.cmti
@@ -332,18 +347,22 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-lib
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_conversion.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_conversion.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_conversion.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_conversion.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_conversion.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_conversion_aux.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_conversion_aux.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_conversion_aux.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_conversion_aux.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_conversion_aux.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_element.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_element.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_element.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_element.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_element.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_id.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_id.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_id.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_id.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_id.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_offsets.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_offsets.cmt
@@ -353,6 +372,7 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-lib
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_origin.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_origin.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_origin.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_origin.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_origin.mli
lib/ocaml/compiler-libs/cmi_format.cmi
lib/ocaml/compiler-libs/cmi_format.cmt
@@ -395,6 +415,21 @@ lib/ocaml/compiler-libs/compdynlink.cmt
lib/ocaml/compiler-libs/compdynlink.cmti
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compdynlink.cmx
lib/ocaml/compiler-libs/compdynlink.mli
+lib/ocaml/compiler-libs/compdynlink_common.cmi
+lib/ocaml/compiler-libs/compdynlink_common.cmt
+lib/ocaml/compiler-libs/compdynlink_common.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compdynlink_common.cmx
+lib/ocaml/compiler-libs/compdynlink_common.mli
+lib/ocaml/compiler-libs/compdynlink_platform_intf.cmi
+lib/ocaml/compiler-libs/compdynlink_platform_intf.cmt
+lib/ocaml/compiler-libs/compdynlink_platform_intf.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compdynlink_platform_intf.cmx
+lib/ocaml/compiler-libs/compdynlink_platform_intf.mli
+lib/ocaml/compiler-libs/compdynlink_types.cmi
+lib/ocaml/compiler-libs/compdynlink_types.cmt
+lib/ocaml/compiler-libs/compdynlink_types.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compdynlink_types.cmx
+lib/ocaml/compiler-libs/compdynlink_types.mli
lib/ocaml/compiler-libs/compenv.cmi
lib/ocaml/compiler-libs/compenv.cmt
lib/ocaml/compiler-libs/compenv.cmti
@@ -403,12 +438,18 @@ lib/ocaml/compiler-libs/compenv.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compilation_unit.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compilation_unit.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compilation_unit.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compilation_unit.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compilation_unit.mli
lib/ocaml/compiler-libs/compile.cmi
lib/ocaml/compiler-libs/compile.cmt
lib/ocaml/compiler-libs/compile.cmti
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compile.cmx
lib/ocaml/compiler-libs/compile.mli
+lib/ocaml/compiler-libs/compile_common.cmi
+lib/ocaml/compiler-libs/compile_common.cmt
+lib/ocaml/compiler-libs/compile_common.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compile_common.cmx
+lib/ocaml/compiler-libs/compile_common.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compilenv.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compilenv.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compilenv.cmti
@@ -452,6 +493,7 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-lib
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/debuginfo.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/debuginfo.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/debuginfo.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/debuginfo.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/debuginfo.mli
lib/ocaml/compiler-libs/depend.cmi
lib/ocaml/compiler-libs/depend.cmt
@@ -471,6 +513,7 @@ lib/ocaml/compiler-libs/docstrings.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/effect_analysis.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/effect_analysis.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/effect_analysis.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/effect_analysis.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/effect_analysis.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/emit.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/emit.cmt
@@ -505,6 +548,7 @@ lib/ocaml/compiler-libs/errors.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/export_id.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/export_id.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/export_id.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/export_id.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/export_id.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/export_info.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/export_info.cmt
@@ -521,22 +565,27 @@ lib/ocaml/compiler-libs/expunge.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/extract_projections.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/extract_projections.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/extract_projections.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/extract_projections.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/extract_projections.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/find_recursive_functions.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/find_recursive_functions.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/find_recursive_functions.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/find_recursive_functions.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/find_recursive_functions.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_invariants.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_invariants.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_invariants.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_invariants.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_invariants.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_iterators.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_iterators.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_iterators.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_iterators.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_iterators.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_to_clambda.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_to_clambda.cmt
@@ -546,10 +595,12 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-lib
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_utils.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_utils.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_utils.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_utils.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_utils.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/freshening.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/freshening.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/freshening.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/freshening.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/freshening.mli
lib/ocaml/compiler-libs/genprintval.cmi
lib/ocaml/compiler-libs/genprintval.cmt
@@ -558,6 +609,7 @@ lib/ocaml/compiler-libs/genprintval.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/id_types.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/id_types.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/id_types.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/id_types.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/id_types.mli
lib/ocaml/compiler-libs/ident.cmi
lib/ocaml/compiler-libs/ident.cmt
@@ -592,26 +644,32 @@ lib/ocaml/compiler-libs/includemod.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inconstant_idents.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inconstant_idents.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inconstant_idents.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inconstant_idents.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inconstant_idents.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/initialize_symbol_to_let_symbol.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/initialize_symbol_to_let_symbol.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/initialize_symbol_to_let_symbol.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/initialize_symbol_to_let_symbol.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/initialize_symbol_to_let_symbol.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inline_and_simplify.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inline_and_simplify.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inline_and_simplify.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inline_and_simplify.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inline_and_simplify.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inline_and_simplify_aux.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inline_and_simplify_aux.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inline_and_simplify_aux.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inline_and_simplify_aux.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inline_and_simplify_aux.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_cost.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_cost.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_cost.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_cost.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_cost.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_decision.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_decision.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_decision.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_decision.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_decision.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_decision_intf.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_decision_intf.cmti
@@ -619,20 +677,28 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-lib
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_stats.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_stats.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_stats.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_stats.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_stats.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_stats_types.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_stats_types.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_stats_types.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_stats_types.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_stats_types.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_transforms.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_transforms.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_transforms.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_transforms.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_transforms.mli
lib/ocaml/compiler-libs/instruct.cmi
lib/ocaml/compiler-libs/instruct.cmt
lib/ocaml/compiler-libs/instruct.cmti
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/instruct.cmx
lib/ocaml/compiler-libs/instruct.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/int_replace_polymorphic_compare.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/int_replace_polymorphic_compare.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/int_replace_polymorphic_compare.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/int_replace_polymorphic_compare.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/int_replace_polymorphic_compare.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/interf.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/interf.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/interf.cmti
@@ -641,6 +707,7 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-lib
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/internal_variable_names.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/internal_variable_names.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/internal_variable_names.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/internal_variable_names.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/internal_variable_names.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/interval.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/interval.cmt
@@ -650,6 +717,7 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-lib
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/invariant_params.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/invariant_params.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/invariant_params.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/invariant_params.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/invariant_params.mli
lib/ocaml/compiler-libs/lambda.cmi
lib/ocaml/compiler-libs/lambda.cmt
@@ -664,14 +732,17 @@ lib/ocaml/compiler-libs/lexer.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lift_code.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lift_code.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lift_code.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lift_code.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lift_code.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lift_constants.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lift_constants.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lift_constants.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lift_constants.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lift_constants.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linearize.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linearize.cmt
@@ -681,6 +752,7 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-lib
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linkage_name.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linkage_name.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linkage_name.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linkage_name.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linkage_name.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linscan.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linscan.cmt
@@ -692,6 +764,11 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-lib
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/liveness.cmti
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/liveness.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/liveness.mli
+lib/ocaml/compiler-libs/load_path.cmi
+lib/ocaml/compiler-libs/load_path.cmt
+lib/ocaml/compiler-libs/load_path.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/load_path.cmx
+lib/ocaml/compiler-libs/load_path.mli
lib/ocaml/compiler-libs/location.cmi
lib/ocaml/compiler-libs/location.cmt
lib/ocaml/compiler-libs/location.cmti
@@ -737,6 +814,7 @@ lib/ocaml/compiler-libs/meta.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/middle_end.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/middle_end.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/middle_end.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/middle_end.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/middle_end.mli
lib/ocaml/compiler-libs/misc.cmi
lib/ocaml/compiler-libs/misc.cmt
@@ -751,6 +829,7 @@ lib/ocaml/compiler-libs/mtype.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/mutable_variable.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/mutable_variable.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/mutable_variable.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/mutable_variable.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/mutable_variable.mli
lib/ocaml/compiler-libs/numbers.cmi
lib/ocaml/compiler-libs/numbers.cmt
@@ -801,6 +880,7 @@ lib/ocaml/compiler-libs/outcometree.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/parameter.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/parameter.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/parameter.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/parameter.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/parameter.mli
lib/ocaml/compiler-libs/parmatch.cmi
lib/ocaml/compiler-libs/parmatch.cmt
@@ -823,6 +903,7 @@ lib/ocaml/compiler-libs/parsetree.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/pass_wrapper.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/pass_wrapper.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/pass_wrapper.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/pass_wrapper.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/pass_wrapper.mli
lib/ocaml/compiler-libs/path.cmi
lib/ocaml/compiler-libs/path.cmt
@@ -912,10 +993,17 @@ lib/ocaml/compiler-libs/profile.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/projection.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/projection.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/projection.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/projection.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/projection.mli
+lib/ocaml/compiler-libs/rec_check.cmi
+lib/ocaml/compiler-libs/rec_check.cmt
+lib/ocaml/compiler-libs/rec_check.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/rec_check.cmx
+lib/ocaml/compiler-libs/rec_check.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ref_to_variables.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ref_to_variables.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ref_to_variables.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ref_to_variables.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ref_to_variables.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg.cmt
@@ -935,18 +1023,22 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-lib
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/remove_free_vars_equal_to_args.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/remove_free_vars_equal_to_args.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/remove_free_vars_equal_to_args.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/remove_free_vars_equal_to_args.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/remove_free_vars_equal_to_args.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/remove_unused_arguments.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/remove_unused_arguments.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/remove_unused_arguments.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/remove_unused_arguments.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/remove_unused_arguments.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/remove_unused_closure_vars.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/remove_unused_closure_vars.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/remove_unused_closure_vars.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/remove_unused_closure_vars.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/remove_unused_closure_vars.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/remove_unused_program_constructs.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/remove_unused_program_constructs.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/remove_unused_program_constructs.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/remove_unused_program_constructs.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/remove_unused_program_constructs.mli
lib/ocaml/compiler-libs/runtimedef.cmi
lib/ocaml/compiler-libs/runtimedef.cmt
@@ -981,18 +1073,22 @@ lib/ocaml/compiler-libs/semantics_of_pri
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/set_of_closures_id.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/set_of_closures_id.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/set_of_closures_id.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/set_of_closures_id.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/set_of_closures_id.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/set_of_closures_origin.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/set_of_closures_origin.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/set_of_closures_origin.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/set_of_closures_origin.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/set_of_closures_origin.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/share_constants.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/share_constants.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/share_constants.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/share_constants.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/share_constants.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simple_value_approx.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simple_value_approx.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simple_value_approx.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simple_value_approx.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simple_value_approx.mli
lib/ocaml/compiler-libs/simplif.cmi
lib/ocaml/compiler-libs/simplif.cmt
@@ -1002,6 +1098,7 @@ lib/ocaml/compiler-libs/simplif.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simplify_boxed_integer_ops.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simplify_boxed_integer_ops.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simplify_boxed_integer_ops.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simplify_boxed_integer_ops.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simplify_boxed_integer_ops.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simplify_boxed_integer_ops_intf.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simplify_boxed_integer_ops_intf.cmti
@@ -1009,10 +1106,12 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-lib
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simplify_common.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simplify_common.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simplify_common.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simplify_common.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simplify_common.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simplify_primitives.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simplify_primitives.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simplify_primitives.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simplify_primitives.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simplify_primitives.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/spacetime_profiling.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/spacetime_profiling.cmt
@@ -1032,6 +1131,7 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-lib
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/static_exception.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/static_exception.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/static_exception.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/static_exception.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/static_exception.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/strmatch.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/strmatch.cmt
@@ -1061,6 +1161,7 @@ lib/ocaml/compiler-libs/switch.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/symbol.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/symbol.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/symbol.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/symbol.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/symbol.mli
lib/ocaml/compiler-libs/symtable.cmi
lib/ocaml/compiler-libs/symtable.cmt
@@ -1075,6 +1176,7 @@ lib/ocaml/compiler-libs/syntaxerr.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/tag.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/tag.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/tag.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/tag.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/tag.mli
lib/ocaml/compiler-libs/targetint.cmi
lib/ocaml/compiler-libs/targetint.cmt
@@ -1086,11 +1188,6 @@ lib/ocaml/compiler-libs/tast_mapper.cmt
lib/ocaml/compiler-libs/tast_mapper.cmti
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/tast_mapper.cmx
lib/ocaml/compiler-libs/tast_mapper.mli
-lib/ocaml/compiler-libs/tbl.cmi
-lib/ocaml/compiler-libs/tbl.cmt
-lib/ocaml/compiler-libs/tbl.cmti
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/tbl.cmx
-lib/ocaml/compiler-libs/tbl.mli
lib/ocaml/compiler-libs/terminfo.cmi
lib/ocaml/compiler-libs/terminfo.cmt
lib/ocaml/compiler-libs/terminfo.cmti
@@ -1165,6 +1262,26 @@ lib/ocaml/compiler-libs/typedecl.cmt
lib/ocaml/compiler-libs/typedecl.cmti
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/typedecl.cmx
lib/ocaml/compiler-libs/typedecl.mli
+lib/ocaml/compiler-libs/typedecl_immediacy.cmi
+lib/ocaml/compiler-libs/typedecl_immediacy.cmt
+lib/ocaml/compiler-libs/typedecl_immediacy.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/typedecl_immediacy.cmx
+lib/ocaml/compiler-libs/typedecl_immediacy.mli
+lib/ocaml/compiler-libs/typedecl_properties.cmi
+lib/ocaml/compiler-libs/typedecl_properties.cmt
+lib/ocaml/compiler-libs/typedecl_properties.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/typedecl_properties.cmx
+lib/ocaml/compiler-libs/typedecl_properties.mli
+lib/ocaml/compiler-libs/typedecl_unboxed.cmi
+lib/ocaml/compiler-libs/typedecl_unboxed.cmt
+lib/ocaml/compiler-libs/typedecl_unboxed.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/typedecl_unboxed.cmx
+lib/ocaml/compiler-libs/typedecl_unboxed.mli
+lib/ocaml/compiler-libs/typedecl_variance.cmi
+lib/ocaml/compiler-libs/typedecl_variance.cmt
+lib/ocaml/compiler-libs/typedecl_variance.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/typedecl_variance.cmx
+lib/ocaml/compiler-libs/typedecl_variance.mli
lib/ocaml/compiler-libs/typedtree.cmi
lib/ocaml/compiler-libs/typedtree.cmt
lib/ocaml/compiler-libs/typedtree.cmti
@@ -1175,11 +1292,6 @@ lib/ocaml/compiler-libs/typedtreeIter.cm
lib/ocaml/compiler-libs/typedtreeIter.cmti
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/typedtreeIter.cmx
lib/ocaml/compiler-libs/typedtreeIter.mli
-lib/ocaml/compiler-libs/typedtreeMap.cmi
-lib/ocaml/compiler-libs/typedtreeMap.cmt
-lib/ocaml/compiler-libs/typedtreeMap.cmti
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/typedtreeMap.cmx
-lib/ocaml/compiler-libs/typedtreeMap.mli
lib/ocaml/compiler-libs/typemod.cmi
lib/ocaml/compiler-libs/typemod.cmt
lib/ocaml/compiler-libs/typemod.cmti
@@ -1208,14 +1320,17 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-lib
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/unbox_closures.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/unbox_closures.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/unbox_closures.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/unbox_closures.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/unbox_closures.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/unbox_free_vars_of_closures.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/unbox_free_vars_of_closures.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/unbox_free_vars_of_closures.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/unbox_free_vars_of_closures.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/unbox_free_vars_of_closures.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/unbox_specialised_args.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/unbox_specialised_args.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/unbox_specialised_args.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/unbox_specialised_args.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/unbox_specialised_args.mli
lib/ocaml/compiler-libs/untypeast.cmi
lib/ocaml/compiler-libs/untypeast.cmt
@@ -1225,10 +1340,12 @@ lib/ocaml/compiler-libs/untypeast.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/var_within_closure.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/var_within_closure.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/var_within_closure.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/var_within_closure.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/var_within_closure.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/variable.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/variable.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/variable.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/variable.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/variable.mli
lib/ocaml/compiler-libs/warnings.cmi
lib/ocaml/compiler-libs/warnings.cmt
@@ -1260,19 +1377,20 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-lib
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/x86_proc.mli
lib/ocaml/complex.ml
lib/ocaml/complex.mli
-lib/ocaml/condition.mli
lib/ocaml/digest.ml
lib/ocaml/digest.mli
-${PLIST.ocaml-opt}lib/ocaml/dynlink.a
+${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/ocaml/dynlink.a
lib/ocaml/dynlink.cma
lib/ocaml/dynlink.cmi
lib/ocaml/dynlink.cmti
-${PLIST.ocaml-opt}lib/ocaml/dynlink.cmx
-${PLIST.ocaml-opt}lib/ocaml/dynlink.cmxa
+${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/ocaml/dynlink.cmx
+${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/ocaml/dynlink.cmxa
lib/ocaml/dynlink.mli
+${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/ocaml/dynlink_common.cmx
+${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/ocaml/dynlink_platform_intf.cmx
+${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/ocaml/dynlink_types.cmx
lib/ocaml/ephemeron.ml
lib/ocaml/ephemeron.mli
-lib/ocaml/event.mli
lib/ocaml/expunge
lib/ocaml/extract_crc
lib/ocaml/filename.ml
@@ -1281,12 +1399,16 @@ lib/ocaml/float.ml
lib/ocaml/float.mli
lib/ocaml/format.ml
lib/ocaml/format.mli
+lib/ocaml/fun.ml
+lib/ocaml/fun.mli
lib/ocaml/gc.ml
lib/ocaml/gc.mli
lib/ocaml/genlex.ml
lib/ocaml/genlex.mli
lib/ocaml/hashtbl.ml
lib/ocaml/hashtbl.mli
+lib/ocaml/int.ml
+lib/ocaml/int.mli
lib/ocaml/int32.ml
lib/ocaml/int32.mli
lib/ocaml/int64.ml
@@ -1302,7 +1424,6 @@ ${PLIST.ocaml-opt}lib/ocaml/libasmrun_sh
${PLIST.ocaml-opt}lib/ocaml/libasmrund.a
${PLIST.instrumented_runtime}${PLIST.ocaml-opt}lib/ocaml/libasmruni.a
${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/libasmrunp.a
-lib/ocaml/libbigarray.a
lib/ocaml/libcamlrun.a
lib/ocaml/libcamlrun_pic.a
lib/ocaml/libcamlrun_shared.so
@@ -1317,256 +1438,12 @@ lib/ocaml/list.ml
lib/ocaml/list.mli
lib/ocaml/listLabels.ml
lib/ocaml/listLabels.mli
-lib/ocaml/${PKGMANDIR}/man1/ocaml.1
-lib/ocaml/${PKGMANDIR}/man1/ocamlc.1
-lib/ocaml/${PKGMANDIR}/man1/ocamlc.opt.1
-lib/ocaml/${PKGMANDIR}/man1/ocamlcp.1
-lib/ocaml/${PKGMANDIR}/man1/ocamldebug.1
-lib/ocaml/${PKGMANDIR}/man1/ocamldep.1
-lib/ocaml/${PKGMANDIR}/man1/ocamldoc.1
-lib/ocaml/${PKGMANDIR}/man1/ocamllex.1
-lib/ocaml/${PKGMANDIR}/man1/ocamlmktop.1
-lib/ocaml/${PKGMANDIR}/man1/ocamlopt.1
-lib/ocaml/${PKGMANDIR}/man1/ocamlopt.opt.1
-lib/ocaml/${PKGMANDIR}/man1/ocamloptp.1
-lib/ocaml/${PKGMANDIR}/man1/ocamlprof.1
-lib/ocaml/${PKGMANDIR}/man1/ocamlrun.1
-lib/ocaml/${PKGMANDIR}/man1/ocamlyacc.1
-lib/ocaml/${PKGMANDIR}/man3/Arg.3
-lib/ocaml/${PKGMANDIR}/man3/Arg_helper.3
-lib/ocaml/${PKGMANDIR}/man3/Arg_helper.Make.3
-lib/ocaml/${PKGMANDIR}/man3/Array.3
-lib/ocaml/${PKGMANDIR}/man3/ArrayLabels.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Cf.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Ci.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Cl.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Const.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Csig.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Cstr.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Ctf.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Cty.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Exp.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Incl.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Mb.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Md.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Mod.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Mtd.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Mty.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Opn.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Pat.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Sig.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Str.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Te.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Typ.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Type.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Val.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Vb.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_invariants.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_iterator.3
-lib/ocaml/${PKGMANDIR}/man3/Ast_mapper.3
-lib/ocaml/${PKGMANDIR}/man3/Asttypes.3
-lib/ocaml/${PKGMANDIR}/man3/Attr_helper.3
-lib/ocaml/${PKGMANDIR}/man3/Bigarray.3
-lib/ocaml/${PKGMANDIR}/man3/Bigarray.Array0.3
-lib/ocaml/${PKGMANDIR}/man3/Bigarray.Array1.3
-lib/ocaml/${PKGMANDIR}/man3/Bigarray.Array2.3
-lib/ocaml/${PKGMANDIR}/man3/Bigarray.Array3.3
-lib/ocaml/${PKGMANDIR}/man3/Bigarray.Genarray.3
-lib/ocaml/${PKGMANDIR}/man3/Buffer.3
-lib/ocaml/${PKGMANDIR}/man3/Build_path_prefix_map.3
-lib/ocaml/${PKGMANDIR}/man3/Builtin_attributes.3
-lib/ocaml/${PKGMANDIR}/man3/Bytes.3
-lib/ocaml/${PKGMANDIR}/man3/BytesLabels.3
-lib/ocaml/${PKGMANDIR}/man3/Callback.3
-lib/ocaml/${PKGMANDIR}/man3/CamlinternalFormat.3
-lib/ocaml/${PKGMANDIR}/man3/CamlinternalFormatBasics.3
-lib/ocaml/${PKGMANDIR}/man3/CamlinternalLazy.3
-lib/ocaml/${PKGMANDIR}/man3/CamlinternalMod.3
-lib/ocaml/${PKGMANDIR}/man3/CamlinternalOO.3
-lib/ocaml/${PKGMANDIR}/man3/Ccomp.3
-lib/ocaml/${PKGMANDIR}/man3/Char.3
-lib/ocaml/${PKGMANDIR}/man3/Clflags.3
-lib/ocaml/${PKGMANDIR}/man3/Clflags.Float_arg_helper.3
-lib/ocaml/${PKGMANDIR}/man3/Clflags.Int_arg_helper.3
-lib/ocaml/${PKGMANDIR}/man3/Complex.3
-lib/ocaml/${PKGMANDIR}/man3/Condition.3
-lib/ocaml/${PKGMANDIR}/man3/Config.3
-lib/ocaml/${PKGMANDIR}/man3/Consistbl.3
-lib/ocaml/${PKGMANDIR}/man3/Depend.3
-lib/ocaml/${PKGMANDIR}/man3/Depend.StringMap.3
-lib/ocaml/${PKGMANDIR}/man3/Depend.StringSet.3
-lib/ocaml/${PKGMANDIR}/man3/Digest.3
-lib/ocaml/${PKGMANDIR}/man3/Docstrings.3
-lib/ocaml/${PKGMANDIR}/man3/Dynlink.3
-lib/ocaml/${PKGMANDIR}/man3/Ephemeron.3
-lib/ocaml/${PKGMANDIR}/man3/Ephemeron.GenHashTable.3
-lib/ocaml/${PKGMANDIR}/man3/Ephemeron.GenHashTable.MakeSeeded.3
-lib/ocaml/${PKGMANDIR}/man3/Ephemeron.K1.3
-lib/ocaml/${PKGMANDIR}/man3/Ephemeron.K1.Make.3
-lib/ocaml/${PKGMANDIR}/man3/Ephemeron.K1.MakeSeeded.3
-lib/ocaml/${PKGMANDIR}/man3/Ephemeron.K2.3
-lib/ocaml/${PKGMANDIR}/man3/Ephemeron.K2.Make.3
-lib/ocaml/${PKGMANDIR}/man3/Ephemeron.K2.MakeSeeded.3
-lib/ocaml/${PKGMANDIR}/man3/Ephemeron.Kn.3
-lib/ocaml/${PKGMANDIR}/man3/Ephemeron.Kn.Make.3
-lib/ocaml/${PKGMANDIR}/man3/Ephemeron.Kn.MakeSeeded.3
-lib/ocaml/${PKGMANDIR}/man3/Ephemeron.S.3
-lib/ocaml/${PKGMANDIR}/man3/Ephemeron.SeededS.3
-lib/ocaml/${PKGMANDIR}/man3/Event.3
-lib/ocaml/${PKGMANDIR}/man3/Filename.3
-lib/ocaml/${PKGMANDIR}/man3/Float.3
-lib/ocaml/${PKGMANDIR}/man3/Float.Array.3
-lib/ocaml/${PKGMANDIR}/man3/Format.3
-lib/ocaml/${PKGMANDIR}/man3/Gc.3
-lib/ocaml/${PKGMANDIR}/man3/Genlex.3
-lib/ocaml/${PKGMANDIR}/man3/Graphics.3
-lib/ocaml/${PKGMANDIR}/man3/GraphicsX11.3
-lib/ocaml/${PKGMANDIR}/man3/Hashtbl.3
-lib/ocaml/${PKGMANDIR}/man3/Hashtbl.HashedType.3
-lib/ocaml/${PKGMANDIR}/man3/Hashtbl.Make.3
-lib/ocaml/${PKGMANDIR}/man3/Hashtbl.MakeSeeded.3
-lib/ocaml/${PKGMANDIR}/man3/Hashtbl.S.3
-lib/ocaml/${PKGMANDIR}/man3/Hashtbl.SeededHashedType.3
-lib/ocaml/${PKGMANDIR}/man3/Hashtbl.SeededS.3
-lib/ocaml/${PKGMANDIR}/man3/Identifiable.3
-lib/ocaml/${PKGMANDIR}/man3/Identifiable.Make.3
-lib/ocaml/${PKGMANDIR}/man3/Identifiable.Map.3
-lib/ocaml/${PKGMANDIR}/man3/Identifiable.Map.T.3
-lib/ocaml/${PKGMANDIR}/man3/Identifiable.Pair.3
-lib/ocaml/${PKGMANDIR}/man3/Identifiable.S.3
-lib/ocaml/${PKGMANDIR}/man3/Identifiable.S.Map.3
-lib/ocaml/${PKGMANDIR}/man3/Identifiable.S.Set.3
-lib/ocaml/${PKGMANDIR}/man3/Identifiable.S.T.3
-lib/ocaml/${PKGMANDIR}/man3/Identifiable.S.Tbl.3
-lib/ocaml/${PKGMANDIR}/man3/Identifiable.Set.3
-lib/ocaml/${PKGMANDIR}/man3/Identifiable.Set.T.3
-lib/ocaml/${PKGMANDIR}/man3/Identifiable.Tbl.3
-lib/ocaml/${PKGMANDIR}/man3/Identifiable.Tbl.T.3
-lib/ocaml/${PKGMANDIR}/man3/Identifiable.Thing.3
-lib/ocaml/${PKGMANDIR}/man3/Int32.3
-lib/ocaml/${PKGMANDIR}/man3/Int64.3
-lib/ocaml/${PKGMANDIR}/man3/Lazy.3
-lib/ocaml/${PKGMANDIR}/man3/Lexer.3
-lib/ocaml/${PKGMANDIR}/man3/Lexing.3
-lib/ocaml/${PKGMANDIR}/man3/List.3
-lib/ocaml/${PKGMANDIR}/man3/ListLabels.3
-lib/ocaml/${PKGMANDIR}/man3/Location.3
-lib/ocaml/${PKGMANDIR}/man3/Longident.3
-lib/ocaml/${PKGMANDIR}/man3/Map.3
-lib/ocaml/${PKGMANDIR}/man3/Map.Make.3
-lib/ocaml/${PKGMANDIR}/man3/Map.OrderedType.3
-lib/ocaml/${PKGMANDIR}/man3/Map.S.3
-lib/ocaml/${PKGMANDIR}/man3/Marshal.3
-lib/ocaml/${PKGMANDIR}/man3/Misc.3
-lib/ocaml/${PKGMANDIR}/man3/Misc.Color.3
-lib/ocaml/${PKGMANDIR}/man3/Misc.HookSig.3
-lib/ocaml/${PKGMANDIR}/man3/Misc.Int_literal_converter.3
-lib/ocaml/${PKGMANDIR}/man3/Misc.LongString.3
-lib/ocaml/${PKGMANDIR}/man3/Misc.MakeHooks.3
-lib/ocaml/${PKGMANDIR}/man3/Misc.Stdlib.3
-lib/ocaml/${PKGMANDIR}/man3/Misc.Stdlib.Array.3
-lib/ocaml/${PKGMANDIR}/man3/Misc.Stdlib.List.3
-lib/ocaml/${PKGMANDIR}/man3/Misc.Stdlib.Option.3
-lib/ocaml/${PKGMANDIR}/man3/Misc.StringMap.3
-lib/ocaml/${PKGMANDIR}/man3/Misc.StringSet.3
-lib/ocaml/${PKGMANDIR}/man3/MoreLabels.3
-lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Hashtbl.3
-lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Hashtbl.HashedType.3
-lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Hashtbl.Make.3
-lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Hashtbl.MakeSeeded.3
-lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Hashtbl.S.3
-lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Hashtbl.SeededHashedType.3
-lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Hashtbl.SeededS.3
-lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Map.3
-lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Map.Make.3
-lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Map.OrderedType.3
-lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Map.S.3
-lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Set.3
-lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Set.Make.3
-lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Set.OrderedType.3
-lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Set.S.3
-lib/ocaml/${PKGMANDIR}/man3/Mutex.3
-lib/ocaml/${PKGMANDIR}/man3/Nativeint.3
-lib/ocaml/${PKGMANDIR}/man3/Numbers.3
-lib/ocaml/${PKGMANDIR}/man3/Numbers.Float.3
-lib/ocaml/${PKGMANDIR}/man3/Numbers.Int.3
-lib/ocaml/${PKGMANDIR}/man3/Numbers.Int16.3
-lib/ocaml/${PKGMANDIR}/man3/Numbers.Int8.3
-lib/ocaml/${PKGMANDIR}/man3/Obj.3
-lib/ocaml/${PKGMANDIR}/man3/Obj.Ephemeron.3
-lib/ocaml/${PKGMANDIR}/man3/Oo.3
-lib/ocaml/${PKGMANDIR}/man3/Parse.3
-lib/ocaml/${PKGMANDIR}/man3/Parser.3
-lib/ocaml/${PKGMANDIR}/man3/Parsetree.3
-lib/ocaml/${PKGMANDIR}/man3/Parsing.3
-lib/ocaml/${PKGMANDIR}/man3/Pervasives.3
-lib/ocaml/${PKGMANDIR}/man3/Pervasives.LargeFile.3
-lib/ocaml/${PKGMANDIR}/man3/Pparse.3
-lib/ocaml/${PKGMANDIR}/man3/Pparse.ImplementationHooks.3
-lib/ocaml/${PKGMANDIR}/man3/Pparse.InterfaceHooks.3
-lib/ocaml/${PKGMANDIR}/man3/Pprintast.3
-lib/ocaml/${PKGMANDIR}/man3/Printast.3
-lib/ocaml/${PKGMANDIR}/man3/Printexc.3
-lib/ocaml/${PKGMANDIR}/man3/Printexc.Slot.3
-lib/ocaml/${PKGMANDIR}/man3/Printf.3
-lib/ocaml/${PKGMANDIR}/man3/Profile.3
-lib/ocaml/${PKGMANDIR}/man3/Queue.3
-lib/ocaml/${PKGMANDIR}/man3/Random.3
-lib/ocaml/${PKGMANDIR}/man3/Random.State.3
-lib/ocaml/${PKGMANDIR}/man3/Scanf.3
-lib/ocaml/${PKGMANDIR}/man3/Scanf.Scanning.3
-lib/ocaml/${PKGMANDIR}/man3/Seq.3
-lib/ocaml/${PKGMANDIR}/man3/Set.3
-lib/ocaml/${PKGMANDIR}/man3/Set.Make.3
-lib/ocaml/${PKGMANDIR}/man3/Set.OrderedType.3
-lib/ocaml/${PKGMANDIR}/man3/Set.S.3
-lib/ocaml/${PKGMANDIR}/man3/Simplif.3
-lib/ocaml/${PKGMANDIR}/man3/Simplif.Hooks.3
-lib/ocaml/${PKGMANDIR}/man3/Sort.3
-lib/ocaml/${PKGMANDIR}/man3/Spacetime.3
-lib/ocaml/${PKGMANDIR}/man3/Spacetime.Series.3
-lib/ocaml/${PKGMANDIR}/man3/Spacetime.Snapshot.3
-lib/ocaml/${PKGMANDIR}/man3/Stack.3
-lib/ocaml/${PKGMANDIR}/man3/StdLabels.3
-lib/ocaml/${PKGMANDIR}/man3/StdLabels.Array.3
-lib/ocaml/${PKGMANDIR}/man3/StdLabels.Bytes.3
-lib/ocaml/${PKGMANDIR}/man3/StdLabels.List.3
-lib/ocaml/${PKGMANDIR}/man3/StdLabels.String.3
-lib/ocaml/${PKGMANDIR}/man3/Str.3
-lib/ocaml/${PKGMANDIR}/man3/Stream.3
-lib/ocaml/${PKGMANDIR}/man3/String.3
-lib/ocaml/${PKGMANDIR}/man3/StringLabels.3
-lib/ocaml/${PKGMANDIR}/man3/Strongly_connected_components.3
-lib/ocaml/${PKGMANDIR}/man3/Strongly_connected_components.Make.3
-lib/ocaml/${PKGMANDIR}/man3/Strongly_connected_components.S.3
-lib/ocaml/${PKGMANDIR}/man3/Strongly_connected_components.S.Id.3
-lib/ocaml/${PKGMANDIR}/man3/Syntaxerr.3
-lib/ocaml/${PKGMANDIR}/man3/Sys.3
-lib/ocaml/${PKGMANDIR}/man3/Targetint.3
-lib/ocaml/${PKGMANDIR}/man3/Tbl.3
-lib/ocaml/${PKGMANDIR}/man3/Terminfo.3
-lib/ocaml/${PKGMANDIR}/man3/Thread.3
-lib/ocaml/${PKGMANDIR}/man3/ThreadUnix.3
-lib/ocaml/${PKGMANDIR}/man3/Typemod.3
-lib/ocaml/${PKGMANDIR}/man3/Typemod.ImplementationHooks.3
-lib/ocaml/${PKGMANDIR}/man3/Typemod.InterfaceHooks.3
-lib/ocaml/${PKGMANDIR}/man3/Uchar.3
-lib/ocaml/${PKGMANDIR}/man3/Unix.3
-lib/ocaml/${PKGMANDIR}/man3/Unix.LargeFile.3
-lib/ocaml/${PKGMANDIR}/man3/UnixLabels.3
-lib/ocaml/${PKGMANDIR}/man3/UnixLabels.LargeFile.3
-lib/ocaml/${PKGMANDIR}/man3/Warnings.3
-lib/ocaml/${PKGMANDIR}/man3/Weak.3
-lib/ocaml/${PKGMANDIR}/man3/Weak.Make.3
-lib/ocaml/${PKGMANDIR}/man3/Weak.S.3
lib/ocaml/map.ml
lib/ocaml/map.mli
lib/ocaml/marshal.ml
lib/ocaml/marshal.mli
lib/ocaml/moreLabels.ml
lib/ocaml/moreLabels.mli
-lib/ocaml/mutex.mli
lib/ocaml/nativeint.ml
lib/ocaml/nativeint.mli
lib/ocaml/obj.ml
@@ -1676,8 +1553,11 @@ lib/ocaml/ocamldoc/odoc_value.cmi
${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_value.cmx
lib/ocaml/oo.ml
lib/ocaml/oo.mli
+lib/ocaml/option.ml
+lib/ocaml/option.mli
lib/ocaml/parsing.ml
lib/ocaml/parsing.mli
+lib/ocaml/pervasives.ml
lib/ocaml/printexc.ml
lib/ocaml/printexc.mli
lib/ocaml/printf.ml
@@ -1698,16 +1578,16 @@ ${PLIST.ocaml-spacetime}lib/ocaml/raw_sp
${PLIST.ocaml-spacetime}lib/ocaml/raw_spacetime_lib.cmti
${PLIST.ocaml-spacetime}${PLIST.ocaml-opt}lib/ocaml/raw_spacetime_lib.cmx
${PLIST.ocaml-spacetime}${PLIST.ocaml-opt}lib/ocaml/raw_spacetime_lib.cmxa
-${PLIST.ocaml-spacetime}${PLIST.ocaml-opt}lib/ocaml/raw_spacetime_lib.cmxs
+${PLIST.ocaml-nat}${PLIST.ocaml-spacetime}${PLIST.ocaml-opt}lib/ocaml/raw_spacetime_lib.cmxs
${PLIST.ocaml-spacetime}lib/ocaml/raw_spacetime_lib.mli
+lib/ocaml/result.ml
+lib/ocaml/result.mli
lib/ocaml/scanf.ml
lib/ocaml/scanf.mli
lib/ocaml/seq.ml
lib/ocaml/seq.mli
lib/ocaml/set.ml
lib/ocaml/set.mli
-lib/ocaml/sort.ml
-lib/ocaml/sort.mli
lib/ocaml/spacetime.ml
lib/ocaml/spacetime.mli
lib/ocaml/stack.ml
@@ -1722,7 +1602,7 @@ lib/ocaml/std_exit.ml
${PLIST.ocaml-opt}lib/ocaml/std_exit.o
${PLIST.ocaml-prof}lib/ocaml/std_exit.p.cmt
${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/std_exit.p.cmx
-${PLIST.ocaml-prof}lib/ocaml/std_exit.p.o
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/std_exit.p.o
${PLIST.ocaml-opt}lib/ocaml/stdlib.a
lib/ocaml/stdlib.cma
lib/ocaml/stdlib.cmi
@@ -1760,6 +1640,12 @@ lib/ocaml/stdlib__bigarray.cmti
${PLIST.ocaml-opt}lib/ocaml/stdlib__bigarray.cmx
${PLIST.ocaml-prof}lib/ocaml/stdlib__bigarray.p.cmt
${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__bigarray.p.cmx
+lib/ocaml/stdlib__bool.cmi
+lib/ocaml/stdlib__bool.cmt
+lib/ocaml/stdlib__bool.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__bool.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__bool.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__bool.p.cmx
lib/ocaml/stdlib__buffer.cmi
lib/ocaml/stdlib__buffer.cmt
lib/ocaml/stdlib__buffer.cmti
@@ -1826,6 +1712,12 @@ lib/ocaml/stdlib__format.cmti
${PLIST.ocaml-opt}lib/ocaml/stdlib__format.cmx
${PLIST.ocaml-prof}lib/ocaml/stdlib__format.p.cmt
${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__format.p.cmx
+lib/ocaml/stdlib__fun.cmi
+lib/ocaml/stdlib__fun.cmt
+lib/ocaml/stdlib__fun.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__fun.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__fun.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__fun.p.cmx
lib/ocaml/stdlib__gc.cmi
lib/ocaml/stdlib__gc.cmt
lib/ocaml/stdlib__gc.cmti
@@ -1844,6 +1736,12 @@ lib/ocaml/stdlib__hashtbl.cmti
${PLIST.ocaml-opt}lib/ocaml/stdlib__hashtbl.cmx
${PLIST.ocaml-prof}lib/ocaml/stdlib__hashtbl.p.cmt
${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__hashtbl.p.cmx
+lib/ocaml/stdlib__int.cmi
+lib/ocaml/stdlib__int.cmt
+lib/ocaml/stdlib__int.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__int.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__int.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__int.p.cmx
lib/ocaml/stdlib__int32.cmi
lib/ocaml/stdlib__int32.cmt
lib/ocaml/stdlib__int32.cmti
@@ -1916,12 +1814,24 @@ lib/ocaml/stdlib__oo.cmti
${PLIST.ocaml-opt}lib/ocaml/stdlib__oo.cmx
${PLIST.ocaml-prof}lib/ocaml/stdlib__oo.p.cmt
${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__oo.p.cmx
+lib/ocaml/stdlib__option.cmi
+lib/ocaml/stdlib__option.cmt
+lib/ocaml/stdlib__option.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__option.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__option.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__option.p.cmx
lib/ocaml/stdlib__parsing.cmi
lib/ocaml/stdlib__parsing.cmt
lib/ocaml/stdlib__parsing.cmti
${PLIST.ocaml-opt}lib/ocaml/stdlib__parsing.cmx
${PLIST.ocaml-prof}lib/ocaml/stdlib__parsing.p.cmt
${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__parsing.p.cmx
+lib/ocaml/stdlib__pervasives.cmi
+lib/ocaml/stdlib__pervasives.cmt
+${PLIST.ocaml-opt}lib/ocaml/stdlib__pervasives.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__pervasives.p.cmi
+${PLIST.ocaml-prof}lib/ocaml/stdlib__pervasives.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__pervasives.p.cmx
lib/ocaml/stdlib__printexc.cmi
lib/ocaml/stdlib__printexc.cmt
lib/ocaml/stdlib__printexc.cmti
@@ -1946,6 +1856,12 @@ lib/ocaml/stdlib__random.cmti
${PLIST.ocaml-opt}lib/ocaml/stdlib__random.cmx
${PLIST.ocaml-prof}lib/ocaml/stdlib__random.p.cmt
${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__random.p.cmx
+lib/ocaml/stdlib__result.cmi
+lib/ocaml/stdlib__result.cmt
+lib/ocaml/stdlib__result.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__result.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__result.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__result.p.cmx
lib/ocaml/stdlib__scanf.cmi
lib/ocaml/stdlib__scanf.cmt
lib/ocaml/stdlib__scanf.cmti
@@ -1964,12 +1880,6 @@ lib/ocaml/stdlib__set.cmti
${PLIST.ocaml-opt}lib/ocaml/stdlib__set.cmx
${PLIST.ocaml-prof}lib/ocaml/stdlib__set.p.cmt
${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__set.p.cmx
-lib/ocaml/stdlib__sort.cmi
-lib/ocaml/stdlib__sort.cmt
-lib/ocaml/stdlib__sort.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__sort.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__sort.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__sort.p.cmx
lib/ocaml/stdlib__spacetime.cmi
lib/ocaml/stdlib__spacetime.cmt
lib/ocaml/stdlib__spacetime.cmti
@@ -2018,6 +1928,12 @@ lib/ocaml/stdlib__uchar.cmti
${PLIST.ocaml-opt}lib/ocaml/stdlib__uchar.cmx
${PLIST.ocaml-prof}lib/ocaml/stdlib__uchar.p.cmt
${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__uchar.p.cmx
+lib/ocaml/stdlib__unit.cmi
+lib/ocaml/stdlib__unit.cmt
+lib/ocaml/stdlib__unit.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__unit.cmx
+${PLIST.ocaml-prof}lib/ocaml/stdlib__unit.p.cmt
+${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__unit.p.cmx
lib/ocaml/stdlib__weak.cmi
lib/ocaml/stdlib__weak.cmt
lib/ocaml/stdlib__weak.cmti
@@ -2030,7 +1946,7 @@ lib/ocaml/str.cmi
lib/ocaml/str.cmti
${PLIST.ocaml-opt}lib/ocaml/str.cmx
${PLIST.ocaml-opt}lib/ocaml/str.cmxa
-${PLIST.ocaml-opt}lib/ocaml/str.cmxs
+${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/ocaml/str.cmxs
lib/ocaml/str.mli
lib/ocaml/stream.ml
lib/ocaml/stream.mli
@@ -2038,7 +1954,6 @@ lib/ocaml/string.ml
lib/ocaml/string.mli
lib/ocaml/stringLabels.ml
lib/ocaml/stringLabels.mli
-lib/ocaml/stublibs/dllbigarray.so
lib/ocaml/stublibs/dllcamlstr.so
${PLIST.ocaml-spacetime}lib/ocaml/stublibs/dllraw_spacetime_lib.so
lib/ocaml/stublibs/dllthreads.so
@@ -2048,23 +1963,26 @@ lib/ocaml/sys.ml
lib/ocaml/sys.mli
lib/ocaml/target_camlheaderd
${PLIST.instrumented_runtime}lib/ocaml/target_camlheaderi
-lib/ocaml/thread.mli
-lib/ocaml/threadUnix.mli
lib/ocaml/threads/condition.cmi
lib/ocaml/threads/condition.cmti
${PLIST.ocaml-opt}lib/ocaml/threads/condition.cmx
+lib/ocaml/threads/condition.mli
lib/ocaml/threads/event.cmi
lib/ocaml/threads/event.cmti
${PLIST.ocaml-opt}lib/ocaml/threads/event.cmx
+lib/ocaml/threads/event.mli
lib/ocaml/threads/mutex.cmi
lib/ocaml/threads/mutex.cmti
${PLIST.ocaml-opt}lib/ocaml/threads/mutex.cmx
+lib/ocaml/threads/mutex.mli
lib/ocaml/threads/thread.cmi
lib/ocaml/threads/thread.cmti
${PLIST.ocaml-opt}lib/ocaml/threads/thread.cmx
+lib/ocaml/threads/thread.mli
lib/ocaml/threads/threadUnix.cmi
lib/ocaml/threads/threadUnix.cmti
${PLIST.ocaml-opt}lib/ocaml/threads/threadUnix.cmx
+lib/ocaml/threads/threadUnix.mli
${PLIST.ocaml-opt}lib/ocaml/threads/threads.a
lib/ocaml/threads/threads.cma
${PLIST.ocaml-opt}lib/ocaml/threads/threads.cmxa
@@ -2074,13 +1992,15 @@ lib/ocaml/topdirs.cmti
lib/ocaml/topdirs.mli
lib/ocaml/uchar.ml
lib/ocaml/uchar.mli
+lib/ocaml/unit.ml
+lib/ocaml/unit.mli
${PLIST.ocaml-opt}lib/ocaml/unix.a
lib/ocaml/unix.cma
lib/ocaml/unix.cmi
lib/ocaml/unix.cmti
${PLIST.ocaml-opt}lib/ocaml/unix.cmx
${PLIST.ocaml-opt}lib/ocaml/unix.cmxa
-${PLIST.ocaml-opt}lib/ocaml/unix.cmxs
+${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/ocaml/unix.cmxs
lib/ocaml/unix.mli
lib/ocaml/unixLabels.cmi
lib/ocaml/unixLabels.cmti
@@ -2122,3 +2042,343 @@ man/man1/ocamloptp.1
man/man1/ocamlprof.1
man/man1/ocamlrun.1
man/man1/ocamlyacc.1
+man/man3/Arg.3
+man/man3/Arg_helper.3
+man/man3/Arg_helper.Make.3
+man/man3/Array.3
+man/man3/ArrayLabels.3
+man/man3/Ast_helper.3
+man/man3/Ast_helper.Attr.3
+man/man3/Ast_helper.Cf.3
+man/man3/Ast_helper.Ci.3
+man/man3/Ast_helper.Cl.3
+man/man3/Ast_helper.Const.3
+man/man3/Ast_helper.Csig.3
+man/man3/Ast_helper.Cstr.3
+man/man3/Ast_helper.Ctf.3
+man/man3/Ast_helper.Cty.3
+man/man3/Ast_helper.Exp.3
+man/man3/Ast_helper.Incl.3
+man/man3/Ast_helper.Mb.3
+man/man3/Ast_helper.Md.3
+man/man3/Ast_helper.Mod.3
+man/man3/Ast_helper.Ms.3
+man/man3/Ast_helper.Mtd.3
+man/man3/Ast_helper.Mty.3
+man/man3/Ast_helper.Of.3
+man/man3/Ast_helper.Opn.3
+man/man3/Ast_helper.Pat.3
+man/man3/Ast_helper.Rf.3
+man/man3/Ast_helper.Sig.3
+man/man3/Ast_helper.Str.3
+man/man3/Ast_helper.Te.3
+man/man3/Ast_helper.Typ.3
+man/man3/Ast_helper.Type.3
+man/man3/Ast_helper.Val.3
+man/man3/Ast_helper.Vb.3
+man/man3/Ast_invariants.3
+man/man3/Ast_iterator.3
+man/man3/Ast_mapper.3
+man/man3/Asttypes.3
+man/man3/Attr_helper.3
+man/man3/Bigarray.3
+man/man3/Bigarray.Array0.3
+man/man3/Bigarray.Array1.3
+man/man3/Bigarray.Array2.3
+man/man3/Bigarray.Array3.3
+man/man3/Bigarray.Genarray.3
+man/man3/Bool.3
+man/man3/Buffer.3
+man/man3/Build_path_prefix_map.3
+man/man3/Builtin_attributes.3
+man/man3/Bytes.3
+man/man3/BytesLabels.3
+man/man3/Callback.3
+man/man3/CamlinternalFormat.3
+man/man3/CamlinternalFormatBasics.3
+man/man3/CamlinternalLazy.3
+man/man3/CamlinternalMenhirLib.3
+man/man3/CamlinternalMenhirLib.Convert.3
+man/man3/CamlinternalMenhirLib.Convert.Simplified.3
+man/man3/CamlinternalMenhirLib.Engine.3
+man/man3/CamlinternalMenhirLib.Engine.Make.3
+man/man3/CamlinternalMenhirLib.EngineTypes.3
+man/man3/CamlinternalMenhirLib.EngineTypes.ENGINE.3
+man/man3/CamlinternalMenhirLib.EngineTypes.INCREMENTAL_ENGINE_START.3
+man/man3/CamlinternalMenhirLib.EngineTypes.MONOLITHIC_ENGINE.3
+man/man3/CamlinternalMenhirLib.EngineTypes.TABLE.3
+man/man3/CamlinternalMenhirLib.EngineTypes.TABLE.Log.3
+man/man3/CamlinternalMenhirLib.ErrorReports.3
+man/man3/CamlinternalMenhirLib.General.3
+man/man3/CamlinternalMenhirLib.IncrementalEngine.3
+man/man3/CamlinternalMenhirLib.IncrementalEngine.EVERYTHING.3
+man/man3/CamlinternalMenhirLib.IncrementalEngine.INCREMENTAL_ENGINE.3
+man/man3/CamlinternalMenhirLib.IncrementalEngine.INSPECTION.3
+man/man3/CamlinternalMenhirLib.IncrementalEngine.SYMBOLS.3
+man/man3/CamlinternalMenhirLib.InfiniteArray.3
+man/man3/CamlinternalMenhirLib.InspectionTableFormat.3
+man/man3/CamlinternalMenhirLib.InspectionTableFormat.TABLES.3
+man/man3/CamlinternalMenhirLib.InspectionTableInterpreter.3
+man/man3/CamlinternalMenhirLib.InspectionTableInterpreter.Make.3
+man/man3/CamlinternalMenhirLib.InspectionTableInterpreter.Symbols.3
+man/man3/CamlinternalMenhirLib.LinearizedArray.3
+man/man3/CamlinternalMenhirLib.PackedIntArray.3
+man/man3/CamlinternalMenhirLib.Printers.3
+man/man3/CamlinternalMenhirLib.Printers.Make.3
+man/man3/CamlinternalMenhirLib.RowDisplacement.3
+man/man3/CamlinternalMenhirLib.StaticVersion.3
+man/man3/CamlinternalMenhirLib.TableFormat.3
+man/man3/CamlinternalMenhirLib.TableFormat.TABLES.3
+man/man3/CamlinternalMenhirLib.TableInterpreter.3
+man/man3/CamlinternalMenhirLib.TableInterpreter.MakeEngineTable.3
+man/man3/CamlinternalMod.3
+man/man3/CamlinternalOO.3
+man/man3/Ccomp.3
+man/man3/Char.3
+man/man3/Clflags.3
+man/man3/Clflags.Compiler_pass.3
+man/man3/Clflags.Float_arg_helper.3
+man/man3/Clflags.Int_arg_helper.3
+man/man3/Compiler_libs.3
+man/man3/Complex.3
+man/man3/Condition.3
+man/man3/Config.3
+man/man3/Consistbl.3
+man/man3/Depend.3
+man/man3/Depend.String.3
+man/man3/Digest.3
+man/man3/Docstrings.3
+man/man3/Docstrings.WithMenhir.3
+man/man3/Dynlink.3
+man/man3/Ephemeron.3
+man/man3/Ephemeron.GenHashTable.3
+man/man3/Ephemeron.GenHashTable.MakeSeeded.3
+man/man3/Ephemeron.K1.3
+man/man3/Ephemeron.K1.Make.3
+man/man3/Ephemeron.K1.MakeSeeded.3
+man/man3/Ephemeron.K2.3
+man/man3/Ephemeron.K2.Make.3
+man/man3/Ephemeron.K2.MakeSeeded.3
+man/man3/Ephemeron.Kn.3
+man/man3/Ephemeron.Kn.Make.3
+man/man3/Ephemeron.Kn.MakeSeeded.3
+man/man3/Ephemeron.S.3
+man/man3/Ephemeron.SeededS.3
+man/man3/Event.3
+man/man3/Filename.3
+man/man3/Float.3
+man/man3/Float.Array.3
+man/man3/Float.ArrayLabels.3
+man/man3/Format.3
+man/man3/Fun.3
+man/man3/Gc.3
+man/man3/Genlex.3
+man/man3/Graphics.3
+man/man3/GraphicsX11.3
+man/man3/Hashtbl.3
+man/man3/Hashtbl.HashedType.3
+man/man3/Hashtbl.Make.3
+man/man3/Hashtbl.MakeSeeded.3
+man/man3/Hashtbl.S.3
+man/man3/Hashtbl.SeededHashedType.3
+man/man3/Hashtbl.SeededS.3
+man/man3/Identifiable.3
+man/man3/Identifiable.Make.3
+man/man3/Identifiable.Map.3
+man/man3/Identifiable.Map.T.3
+man/man3/Identifiable.Pair.3
+man/man3/Identifiable.S.3
+man/man3/Identifiable.S.Map.3
+man/man3/Identifiable.S.Set.3
+man/man3/Identifiable.S.T.3
+man/man3/Identifiable.S.Tbl.3
+man/man3/Identifiable.Set.3
+man/man3/Identifiable.Set.T.3
+man/man3/Identifiable.Tbl.3
+man/man3/Identifiable.Tbl.T.3
+man/man3/Identifiable.Thing.3
+man/man3/Int.3
+man/man3/Int32.3
+man/man3/Int64.3
+man/man3/Lazy.3
+man/man3/Lexer.3
+man/man3/Lexing.3
+man/man3/List.3
+man/man3/ListLabels.3
+man/man3/Load_path.3
+man/man3/Load_path.Dir.3
+man/man3/Location.3
+man/man3/Longident.3
+man/man3/Map.3
+man/man3/Map.Make.3
+man/man3/Map.OrderedType.3
+man/man3/Map.S.3
+man/man3/Marshal.3
+man/man3/Misc.3
+man/man3/Misc.Color.3
+man/man3/Misc.Error_style.3
+man/man3/Misc.HookSig.3
+man/man3/Misc.Int_literal_converter.3
+man/man3/Misc.LongString.3
+man/man3/Misc.MakeHooks.3
+man/man3/Misc.Stdlib.3
+man/man3/Misc.Stdlib.Array.3
+man/man3/Misc.Stdlib.List.3
+man/man3/Misc.Stdlib.Option.3
+man/man3/Misc.Stdlib.String.3
+man/man3/Misc.Stdlib.String.Map.3
+man/man3/Misc.Stdlib.String.Set.3
+man/man3/Misc.Stdlib.String.Tbl.3
+man/man3/MoreLabels.3
+man/man3/MoreLabels.Hashtbl.3
+man/man3/MoreLabels.Hashtbl.HashedType.3
+man/man3/MoreLabels.Hashtbl.Make.3
+man/man3/MoreLabels.Hashtbl.MakeSeeded.3
+man/man3/MoreLabels.Hashtbl.S.3
+man/man3/MoreLabels.Hashtbl.SeededHashedType.3
+man/man3/MoreLabels.Hashtbl.SeededS.3
+man/man3/MoreLabels.Map.3
+man/man3/MoreLabels.Map.Make.3
+man/man3/MoreLabels.Map.OrderedType.3
+man/man3/MoreLabels.Map.S.3
+man/man3/MoreLabels.Set.3
+man/man3/MoreLabels.Set.Make.3
+man/man3/MoreLabels.Set.OrderedType.3
+man/man3/MoreLabels.Set.S.3
+man/man3/Mutex.3
+man/man3/Nativeint.3
+man/man3/Numbers.3
+man/man3/Numbers.Float.3
+man/man3/Numbers.Int.3
+man/man3/Numbers.Int16.3
+man/man3/Numbers.Int8.3
+man/man3/Obj.3
+man/man3/Obj.Ephemeron.3
+man/man3/Obj.Extension_constructor.3
+man/man3/Ocaml_operators.3
+man/man3/Oo.3
+man/man3/Option.3
+man/man3/Parse.3
+man/man3/Parser.3
+man/man3/Parser.Incremental.3
+man/man3/Parser.MenhirInterpreter.3
+man/man3/Parsetree.3
+man/man3/Parsing.3
+man/man3/Pervasives.3
+man/man3/Pervasives.LargeFile.3
+man/man3/Pparse.3
+man/man3/Pparse.ImplementationHooks.3
+man/man3/Pparse.InterfaceHooks.3
+man/man3/Pprintast.3
+man/man3/Printast.3
+man/man3/Printexc.3
+man/man3/Printexc.Slot.3
+man/man3/Printf.3
+man/man3/Profile.3
+man/man3/Queue.3
+man/man3/Random.3
+man/man3/Random.State.3
+man/man3/Result.3
+man/man3/Scanf.3
+man/man3/Scanf.Scanning.3
+man/man3/Seq.3
+man/man3/Set.3
+man/man3/Set.Make.3
+man/man3/Set.OrderedType.3
+man/man3/Set.S.3
+man/man3/Simplif.3
+man/man3/Simplif.Hooks.3
+man/man3/Spacetime.3
+man/man3/Spacetime.Series.3
+man/man3/Spacetime.Snapshot.3
+man/man3/Stack.3
+man/man3/StdLabels.3
+man/man3/StdLabels.Array.3
+man/man3/StdLabels.Bytes.3
+man/man3/StdLabels.List.3
+man/man3/StdLabels.String.3
+man/man3/Stdlib.3
+man/man3/Stdlib.Arg.3
+man/man3/Stdlib.Array.3
+man/man3/Stdlib.ArrayLabels.3
+man/man3/Stdlib.Bigarray.3
+man/man3/Stdlib.Bool.3
+man/man3/Stdlib.Buffer.3
+man/man3/Stdlib.Bytes.3
+man/man3/Stdlib.BytesLabels.3
+man/man3/Stdlib.Callback.3
+man/man3/Stdlib.Char.3
+man/man3/Stdlib.Complex.3
+man/man3/Stdlib.Digest.3
+man/man3/Stdlib.Ephemeron.3
+man/man3/Stdlib.Filename.3
+man/man3/Stdlib.Float.3
+man/man3/Stdlib.Format.3
+man/man3/Stdlib.Fun.3
+man/man3/Stdlib.Gc.3
+man/man3/Stdlib.Genlex.3
+man/man3/Stdlib.Hashtbl.3
+man/man3/Stdlib.Int.3
+man/man3/Stdlib.Int32.3
+man/man3/Stdlib.Int64.3
+man/man3/Stdlib.LargeFile.3
+man/man3/Stdlib.Lazy.3
+man/man3/Stdlib.Lexing.3
+man/man3/Stdlib.List.3
+man/man3/Stdlib.ListLabels.3
+man/man3/Stdlib.Map.3
+man/man3/Stdlib.Marshal.3
+man/man3/Stdlib.MoreLabels.3
+man/man3/Stdlib.Nativeint.3
+man/man3/Stdlib.Obj.3
+man/man3/Stdlib.Oo.3
+man/man3/Stdlib.Option.3
+man/man3/Stdlib.Parsing.3
+man/man3/Stdlib.Pervasives.3
+man/man3/Stdlib.Printexc.3
+man/man3/Stdlib.Printf.3
+man/man3/Stdlib.Queue.3
+man/man3/Stdlib.Random.3
+man/man3/Stdlib.Result.3
+man/man3/Stdlib.Scanf.3
+man/man3/Stdlib.Seq.3
+man/man3/Stdlib.Set.3
+man/man3/Stdlib.Spacetime.3
+man/man3/Stdlib.Stack.3
+man/man3/Stdlib.StdLabels.3
+man/man3/Stdlib.Stream.3
+man/man3/Stdlib.String.3
+man/man3/Stdlib.StringLabels.3
+man/man3/Stdlib.Sys.3
+man/man3/Stdlib.Uchar.3
+man/man3/Stdlib.Unit.3
+man/man3/Stdlib.Weak.3
+man/man3/Str.3
+man/man3/Stream.3
+man/man3/String.3
+man/man3/StringLabels.3
+man/man3/Strongly_connected_components.3
+man/man3/Strongly_connected_components.Make.3
+man/man3/Strongly_connected_components.S.3
+man/man3/Strongly_connected_components.S.Id.3
+man/man3/Syntaxerr.3
+man/man3/Sys.3
+man/man3/Targetint.3
+man/man3/Terminfo.3
+man/man3/Thread.3
+man/man3/ThreadUnix.3
+man/man3/Typemod.3
+man/man3/Typemod.ImplementationHooks.3
+man/man3/Typemod.InterfaceHooks.3
+man/man3/Typemod.Sig_component_kind.3
+man/man3/Typemod.Signature_names.3
+man/man3/Uchar.3
+man/man3/Unit.3
+man/man3/Unix.3
+man/man3/Unix.LargeFile.3
+man/man3/UnixLabels.3
+man/man3/UnixLabels.LargeFile.3
+man/man3/Warnings.3
+man/man3/Weak.3
+man/man3/Weak.Make.3
+man/man3/Weak.S.3
Index: pkgsrc/lang/ocaml/buildlink3.mk
diff -u pkgsrc/lang/ocaml/buildlink3.mk:1.51 pkgsrc/lang/ocaml/buildlink3.mk:1.52
--- pkgsrc/lang/ocaml/buildlink3.mk:1.51 Wed May 15 09:39:21 2019
+++ pkgsrc/lang/ocaml/buildlink3.mk Sat Aug 24 10:54:23 2019
@@ -1,24 +1,20 @@
-# $NetBSD: buildlink3.mk,v 1.51 2019/05/15 09:39:21 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.52 2019/08/24 10:54:23 jaapb Exp $
BUILDLINK_TREE+= ocaml
.if !defined(OCAML_BUILDLINK3_MK)
OCAML_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.ocaml+= ocaml>=4.07.0
-BUILDLINK_ABI_DEPENDS.ocaml+= ocaml>=4.07.1nb3
+BUILDLINK_API_DEPENDS.ocaml+= ocaml>=4.08.0
+BUILDLINK_ABI_DEPENDS.ocaml+= ocaml>=4.08.1
BUILDLINK_PKGSRCDIR.ocaml?= ../../lang/ocaml
#BUILDLINK_DEPMETHOD.ocaml?= build
BUILDLINK_PASSTHRU_DIRS+= ${BUILDLINK_PREFIX.ocaml}/lib/ocaml
-.include "../../mk/ocaml.mk"
-
BUILDLINK_TARGETS+= ocaml-wrappers
-OCAML_WRAPPERS= ocamlc ocamlcp ocamlmklib ocamlmktop
-.if ${OCAML_USE_OPT_COMPILER} == "yes"
-OCAML_WRAPPERS+= ocamlc.opt ocamlopt ocamlopt.opt
-.endif
+OCAML_WRAPPERS= ocamlc ocamlc.opt ocamlcp ocamlmklib ocamlmktop \
+ ocamlopt ocamlopt.opt
OCAMLBIN_WRAPPERS= ocaml ocamldep ocamllex ocamlyacc
.PHONY: ocaml-wrappers
Index: pkgsrc/lang/ocaml/hacks.mk
diff -u pkgsrc/lang/ocaml/hacks.mk:1.6 pkgsrc/lang/ocaml/hacks.mk:1.7
--- pkgsrc/lang/ocaml/hacks.mk:1.6 Mon Dec 15 11:46:35 2014
+++ pkgsrc/lang/ocaml/hacks.mk Sat Aug 24 10:54:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.6 2014/12/15 11:46:35 jperkin Exp $
+# $NetBSD: hacks.mk,v 1.7 2019/08/24 10:54:23 jaapb Exp $
.if !defined(OCAML_HACKS_MK)
OCAML_HACKS_MK= defined
@@ -15,12 +15,12 @@ OCAML_HACKS_MK= defined
### itself.
###
.if !empty(MACHINE_PLATFORM:MDarwin-[0-9].*-*)
-PKG_HACKS+= no_compact_unwind
-SUBST_CLASSES+= no_compact_unwind
-SUBST_MESSAGE.no_compact_unwind= Removing -no_compact_unwind from linker options
-SUBST_FILES.no_compact_unwind= configure
-SUBST_SED.no_compact_unwind= -e 's/-Wl,-no_compact_unwind//g'
-SUBST_STAGE.no_compact_unwind= pre-configure
+PKG_HACKS+= no_compact_unwind
+SUBST_CLASSES+= no_compact_unwind
+SUBST_MESSAGE.no_compact_unwind= Removing -no_compact_unwind from linker options
+SUBST_FILES.no_compact_unwind= configure
+SUBST_SED.no_compact_unwind= -e 's/-Wl,-no_compact_unwind//g'
+SUBST_STAGE.no_compact_unwind= pre-configure
.endif
### [ Wed Oct 7 9:16:42 GMT 2009 : dmcmahill ]
Index: pkgsrc/lang/ocaml/options.mk
diff -u pkgsrc/lang/ocaml/options.mk:1.1 pkgsrc/lang/ocaml/options.mk:1.2
--- pkgsrc/lang/ocaml/options.mk:1.1 Fri Sep 8 09:12:44 2017
+++ pkgsrc/lang/ocaml/options.mk Sat Aug 24 10:54:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2017/09/08 09:12:44 jaapb Exp $
+# $NetBSD: options.mk,v 1.2 2019/08/24 10:54:23 jaapb Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.ocaml
PKG_SUPPORTED_OPTIONS= pic flambda spacetime
@@ -8,13 +8,19 @@ PKG_SUGGESTED_OPTIONS= pic
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mpic)
-CONFIGURE_ARGS+= -fPIC
+CONFIGURE_ARGS+= --with-pic
+.else
+CONFIGURE_ARGS+= --without-pic
.endif
.if !empty(PKG_OPTIONS:Mflambda)
-CONFIGURE_ARGS+= -flambda
+CONFIGURE_ARGS+= --enable-flambda
+.else
+CONFIGURE_ARGS+= --disable-flambda
.endif
.if !empty(PKG_OPTIONS:Mspacetime)
-CONFIGURE_ARGS+= -spacetime
+CONFIGURE_ARGS+= --enable-spacetime
+.else
+CONFIGURE_ARGS+= --disable-spacetime
.endif
Index: pkgsrc/lang/ocaml/patches/patch-Makefile
diff -u pkgsrc/lang/ocaml/patches/patch-Makefile:1.13 pkgsrc/lang/ocaml/patches/patch-Makefile:1.14
--- pkgsrc/lang/ocaml/patches/patch-Makefile:1.13 Thu Jul 19 12:46:04 2018
+++ pkgsrc/lang/ocaml/patches/patch-Makefile Sat Aug 24 10:54:23 2019
@@ -1,9 +1,19 @@
-$NetBSD: patch-Makefile,v 1.13 2018/07/19 12:46:04 jaapb Exp $
+$NetBSD: patch-Makefile,v 1.14 2019/08/24 10:54:23 jaapb Exp $
Use BSD_INSTALL_* instead of mkdir
---- Makefile.orig 2018-07-10 14:09:26.000000000 +0000
+Honor LDFLAGS
+--- Makefile.orig 2019-04-18 10:10:54.000000000 +0000
+++ Makefile
-@@ -597,10 +597,10 @@ endif
+@@ -54,7 +54,7 @@ INCLUDES=-I utils -I parsing -I typing -
+ COMPFLAGS=-strict-sequence -principal -absname -w +a-4-9-40-41-42-44-45-48-66 \
+ -warn-error A \
+ -bin-annot -safe-string -strict-formats $(INCLUDES)
+-LINKFLAGS=
++LINKFLAGS= -cclib "$(LDFLAGS)"
+
+ ifeq "$(strip $(NATDYNLINKOPTS))" ""
+ OCAML_NATDYNLINKOPTS=
+@@ -513,10 +513,10 @@ endif
# Installation
.PHONY: install
install:
@@ -18,8 +28,8 @@ Use BSD_INSTALL_* instead of mkdir
$(INSTALL_DATA) \
VERSION \
"$(INSTALL_LIBDIR)"
-@@ -630,7 +630,7 @@ install:
- "$(INSTALL_LIBDIR)"
+@@ -564,7 +564,7 @@ ifeq "$(INSTALL_SOURCE_ARTIFACTS)" "true
+ endif
$(MAKE) -C tools install
ifeq "$(UNIX_OR_WIN32)" "unix" # Install manual pages only on Unix
- $(MKDIR) "$(INSTALL_MANDIR)/man$(PROGRAMS_MAN_SECTION)"
Index: pkgsrc/lang/ocaml/patches/patch-asmcomp_amd64_emit.mlp
diff -u pkgsrc/lang/ocaml/patches/patch-asmcomp_amd64_emit.mlp:1.3 pkgsrc/lang/ocaml/patches/patch-asmcomp_amd64_emit.mlp:1.4
--- pkgsrc/lang/ocaml/patches/patch-asmcomp_amd64_emit.mlp:1.3 Wed Jul 18 00:09:12 2018
+++ pkgsrc/lang/ocaml/patches/patch-asmcomp_amd64_emit.mlp Sat Aug 24 10:54:23 2019
@@ -1,5 +1,6 @@
-$NetBSD: patch-asmcomp_amd64_emit.mlp,v 1.3 2018/07/18 00:09:12 joerg Exp $
+$NetBSD: patch-asmcomp_amd64_emit.mlp,v 1.4 2019/08/24 10:54:23 jaapb Exp $
+Fix attributes and entry size for the .rodata mergable constant section
--- asmcomp/amd64/emit.mlp.orig 2018-07-17 21:17:05.536787953 +0000
+++ asmcomp/amd64/emit.mlp
@@ -986,7 +986,7 @@ let begin_assembly() =
Index: pkgsrc/lang/ocaml/patches/patch-driver_compenv.ml
diff -u pkgsrc/lang/ocaml/patches/patch-driver_compenv.ml:1.3 pkgsrc/lang/ocaml/patches/patch-driver_compenv.ml:1.4
--- pkgsrc/lang/ocaml/patches/patch-driver_compenv.ml:1.3 Thu May 5 08:12:01 2016
+++ pkgsrc/lang/ocaml/patches/patch-driver_compenv.ml Sat Aug 24 10:54:23 2019
@@ -1,14 +1,14 @@
-$NetBSD: patch-driver_compenv.ml,v 1.3 2016/05/05 08:12:01 jaapb Exp $
+$NetBSD: patch-driver_compenv.ml,v 1.4 2019/08/24 10:54:23 jaapb Exp $
pkgsrc_runtime flag
---- driver/compenv.ml.orig 2016-04-01 12:53:41.000000000 +0000
+--- driver/compenv.ml.orig 2019-02-08 14:34:09.000000000 +0000
+++ driver/compenv.ml
-@@ -217,6 +217,7 @@ let read_one_param ppf position name v =
+@@ -235,6 +235,7 @@ let read_one_param ppf position name v =
| "pp" -> preprocessor := Some v
| "runtime-variant" -> runtime_variant := v
+ | "pkgsrc-runtime" -> set "pkgsrc-runtime" [ pkgsrc_runtime ] v
+ | "open" ->
+ open_modules := List.rev_append (String.split_on_char ',' v) !open_modules
| "cc" -> c_compiler := Some v
-
- | "clambda-checks" -> set "clambda-checks" [ clambda_checks ] v
Index: pkgsrc/lang/ocaml/patches/patch-yacc_Makefile
diff -u pkgsrc/lang/ocaml/patches/patch-yacc_Makefile:1.3 pkgsrc/lang/ocaml/patches/patch-yacc_Makefile:1.4
--- pkgsrc/lang/ocaml/patches/patch-yacc_Makefile:1.3 Wed Jan 10 14:30:35 2018
+++ pkgsrc/lang/ocaml/patches/patch-yacc_Makefile Sat Aug 24 10:54:23 2019
@@ -1,14 +1,14 @@
-$NetBSD: patch-yacc_Makefile,v 1.3 2018/01/10 14:30:35 jaapb Exp $
+$NetBSD: patch-yacc_Makefile,v 1.4 2019/08/24 10:54:23 jaapb Exp $
Honor LDFLAGS when building ocamlyacc.
---- yacc/Makefile.orig 2017-11-03 13:52:14.000000000 +0000
+--- yacc/Makefile.orig 2019-03-01 15:13:46.000000000 +0000
+++ yacc/Makefile
-@@ -28,7 +28,7 @@ MKEXE_ANSI=$(MKEXE)
+@@ -36,7 +36,7 @@ MKEXE_ANSI=$(MKEXE)
endif
- ocamlyacc$(EXE): $(OBJS)
-- $(MKEXE_ANSI) -o ocamlyacc$(EXE) $(OBJS) $(EXTRALIBS)
-+ $(MKEXE_ANSI) $(BYTECCLIBS) -o ocamlyacc$(EXE) $(OBJS) $(EXTRALIBS)
+ ocamlyacc$(EXE): $(ocamlyacc_OBJECTS)
+- $(MKEXE_ANSI) -o $@ $^ $(EXTRALIBS)
++ $(MKEXE_ANSI) $(BYTECCLIBS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS)
- version.h : ../VERSION
- echo "#define OCAML_VERSION \"`sed -e 1q $^ | tr -d '\r'`\"" > $@
+ version.h : $(ROOTDIR)/VERSION
+ echo "#define OCAML_VERSION \"`sed -e 1q $< | tr -d '\r'`\"" > $@
Index: pkgsrc/lang/ocaml/patches/patch-asmrun_amd64.S
diff -u pkgsrc/lang/ocaml/patches/patch-asmrun_amd64.S:1.1 pkgsrc/lang/ocaml/patches/patch-asmrun_amd64.S:1.2
--- pkgsrc/lang/ocaml/patches/patch-asmrun_amd64.S:1.1 Wed Jul 18 00:09:12 2018
+++ pkgsrc/lang/ocaml/patches/patch-asmrun_amd64.S Sat Aug 24 10:54:23 2019
@@ -1,7 +1,8 @@
-$NetBSD: patch-asmrun_amd64.S,v 1.1 2018/07/18 00:09:12 joerg Exp $
+$NetBSD: patch-asmrun_amd64.S,v 1.2 2019/08/24 10:54:23 jaapb Exp $
---- asmrun/amd64.S.orig 2018-07-17 21:24:20.027817665 +0000
-+++ asmrun/amd64.S
+Fix attributes and entry size for the .rodata mergable constant section
+--- runtime/amd64.S.orig 2018-07-17 21:24:20.027817665 +0000
++++ runtime/amd64.S
@@ -724,7 +724,7 @@ G(caml_system__spacetime_shapes):
#elif defined(SYS_mingw64) || defined(SYS_cygwin)
.section .rdata,"dr"
Index: pkgsrc/lang/ocaml/patches/patch-configure
diff -u pkgsrc/lang/ocaml/patches/patch-configure:1.36 pkgsrc/lang/ocaml/patches/patch-configure:1.37
--- pkgsrc/lang/ocaml/patches/patch-configure:1.36 Wed May 15 09:39:21 2019
+++ pkgsrc/lang/ocaml/patches/patch-configure Sat Aug 24 10:54:23 2019
@@ -1,184 +1,62 @@
-$NetBSD: patch-configure,v 1.36 2019/05/15 09:39:21 jaapb Exp $
+$NetBSD: patch-configure,v 1.37 2019/08/24 10:54:23 jaapb Exp $
All kinds of OS-specific changes to configure
Honor LDFLAGS.
---- configure.orig 2018-10-04 14:23:12.000000000 +0000
-+++ configure 2019-04-03 12:40:28.584971437 +0000
-@@ -797,7 +797,7 @@
+--- configure.orig 2019-03-01 15:13:45.000000000 +0000
++++ configure
+@@ -13379,7 +13379,7 @@ sharedlib_cflags=''
mksharedlib='shared-libs-not-available'
rpath=''
mksharedlibrpath=''
-natdynlinkopts=""
+natdynlinkopts="-L/usr/lib -R/usr/lib -R/usr/pkg/lib"
- if $with_sharedlibs; then
- case "$target" in
-@@ -826,10 +826,13 @@
- esac;;
- *-*-solaris2*)
- case "$cc" in
-- *gcc*)
-+ *clang*|*gcc*)
- sharedcccompopts="-fPIC"
-- if sh ./solaris-ld; then
-- mksharedlib="ld -G"
-+ if true; then
-+ case "$target" in
-+ x86_64*) mksharedlib="$cc -shared" ;;
-+ *) mksharedlib="$cc -G" ;;
-+ esac
- rpath="-R"
- mksharedlibrpath="-R"
- else
-@@ -856,7 +859,7 @@
- rpath="-Wl,-rpath,"
- mksharedlibrpath="-rpath "
- shared_libraries_supported=true;;
-- i[3456]86-*-darwin[89].*)
-+ i[3456]86-*-darwin.*)
- mksharedlib="$cc -shared -flat_namespace -undefined suppress \
- -read_only_relocs suppress"
- common_cflags="$dl_defs $common_cflags"
-@@ -905,11 +908,7 @@
- i[3456]86-*-linux*) natdynlink=true;;
- i[3456]86-*-gnu*) natdynlink=true;;
- x86_64-*-linux*) natdynlink=true;;
-- i[3456]86-*-darwin[89].*) natdynlink=true;;
-- i[3456]86-*-darwin*)
-- if test $arch64 == true; then
-- natdynlink=true
-- fi;;
-+ i[3456]86-*-darwin*) natdynlink=true;;
- x86_64-*-darwin*) natdynlink=true;;
- s390x*-*-linux*) natdynlink=true;;
- powerpc*-*-linux*) natdynlink=true;;
-@@ -922,12 +921,17 @@
- x86_64-*-openbsd*) natdynlink=true;;
- i[3456]86-*-netbsd*) natdynlink=true;;
- x86_64-*-netbsd*) natdynlink=true;;
-+ i[3456]86-*-dragonfly*) natdynlink=true;;
-+ x86_64-*-dragonfly*) natdynlink=true;;
-+ *-*-solaris*) natdynlink=true;;
- i386-*-gnu0.3) natdynlink=true;;
- i[3456]86-*-haiku*) natdynlink=true;;
- arm*-*-linux*) natdynlink=true;;
- arm*-*-freebsd*) natdynlink=true;;
-+ arm*-*-netbsd*) natdynlink=true;;
- earm*-*-netbsd*) natdynlink=true;;
- aarch64-*-linux*) natdynlink=true;;
-+ aarch64-*-netbsd*) natdynlink=true;;
- esac
- fi
-
-@@ -965,6 +969,7 @@
- i[3456]86-*-haiku*) arch=i386; system=beos;;
- i[3456]86-*-beos*) arch=i386; system=beos;;
- i[3456]86-*-cygwin*) arch=i386; system=cygwin;;
-+ i[3456]86-*-interix3*) arch=i386; system=interix3;;
- i[3456]86-*-darwin*) if $arch64; then
- arch=amd64; system=macosx
- else
-@@ -987,6 +992,8 @@
- armv6t2*-*-linux-gnueabi) arch=arm; model=armv6t2; system=linux_eabi;;
- armv6*-*-linux-gnueabi) arch=arm; model=armv6; system=linux_eabi;;
- armv6*-*-freebsd*) arch=arm; model=armv6; system=freebsd;;
-+ armv6-*-netbsdelf*) arch=arm; model=armv6; system=netbsd;;
-+ armv7-*-netbsdelf*) arch=arm; model=armv7; system=netbsd;;
- earmv6*-*-netbsd*) arch=arm; model=armv6; system=netbsd;;
- earmv7*-*-netbsd*) arch=arm; model=armv7; system=netbsd;;
- armv5te*-*-linux-gnueabi) arch=arm; model=armv5te; system=linux_eabi;;
-@@ -1003,7 +1010,9 @@
- x86_64-*-darwin*) arch=amd64; system=macosx;;
- x86_64-*-mingw*) arch=amd64; system=mingw;;
- aarch64-*-linux*) arch=arm64; system=linux;;
-+ aarch64-*-netbsd*) arch=arm64; system=netbsd;;
- x86_64-*-cygwin*) arch=amd64; system=cygwin;;
-+ x86_64-*-solaris*) arch=amd64; system=solaris;;
- esac
-
- # Some platforms exist both in 32-bit and 64-bit variants, not distinguished
-@@ -1027,7 +1036,6 @@
- case "$arch,$cc,$system,$model" in
- *,*,rhapsody,*) if $arch64; then partialld="ld -r -arch ppc64"; fi;;
- amd64,gcc*,macosx,*) partialld="ld -r -arch x86_64";;
-- amd64,gcc*,solaris,*) partialld="ld -r -m elf_x86_64";;
- power,gcc*,elf,ppc) partialld="ld -r -m elf32ppclinux";;
- power,gcc*,elf,ppc64) partialld="ld -r -m elf64ppc";;
- power,gcc*,elf,ppc64le) partialld="ld -r -m elf64lppc";;
-@@ -1045,8 +1053,8 @@
- fi;;
- amd64,solaris) as="${TOOLPREF}as --64"
- aspp="${TOOLPREF}gcc -m64 -c";;
-- i386,solaris) as="${TOOLPREF}as"
-- aspp="${TOOLPREF}gcc -c";;
-+ i386,solaris) as="${TOOLPREF}as --32"
-+ aspp="${TOOLPREF}gcc -m32 -c";;
- power,elf) if $arch64; then
- as="${TOOLPREF}as -a64 -mppc64"
- aspp="${TOOLPREF}gcc -m64 -c"
-@@ -1094,6 +1102,8 @@
- power,elf) profiling='true';;
- power,bsd*) profiling='true';;
- power,netbsd) profiling='true';;
-+ amd64,solaris) profiling='true';;
-+ *,dragonfly) profiling='true';;
- *) profiling='false';;
+ if test x"$enable_shared" != "xno"; then :
+ case $host in #(
+@@ -13475,6 +13475,8 @@ fi ;; #(
+ natdynlink=true ;; #(
+ aarch64-*-linux*) :
+ natdynlink=true ;; #(
++ aarch64-*-netbsd*) :
++ natdynlink=true ;; #(
+ *) :
+ ;;
esac
-
-@@ -1672,6 +1682,8 @@
- x11_include="not found"
- x11_link="not found"
-
-+if test "$disable_x11" != "yes"; then
-+
- if test -z "$x11_include_dir" -a -z "$x11_lib_dir"; then
- if pkg-config --exists x11 2>/dev/null; then
- x11_include=`pkg-config --cflags x11`
-@@ -1718,6 +1730,7 @@
- /usr/XFree86/include/X11 \
- \
- /usr/include \
-+ /usr/pkg/include \
- /usr/local/include \
- /usr/unsupported/include \
- /usr/athena/include \
-@@ -1775,6 +1788,7 @@
- \
- /usr/lib64 \
- /usr/lib \
-+ /usr/pkg/lib \
- /usr/local/lib \
- /usr/unsupported/lib \
- /usr/athena/lib \
-@@ -1798,18 +1812,16 @@
- if test $dir = /usr/lib; then
- x11_link="-lX11"
- else
-- case "$target" in
-- *-*-freebsd*|*-*-dragonfly*) x11_link="-L$dir -lX11";;
-- *-kfreebsd*-gnu) x11_link="-L$dir -lX11";;
-- *-*-*bsd*) x11_link="-R$dir -L$dir -lX11";;
-- *) x11_link="-L$dir -lX11";;
-- esac
-+ x11_libs="-L$dir ${COMPILER_RPATH_FLAG}$dir"
-+ x11_link="-L$dir ${COMPILER_RPATH_FLAG}$dir -lX11"
- fi
- break
- fi
- done
- fi
-
-+fi # end of disable_x11 test
-+
- if test "$x11_include" != "not found"; then
- if test "$x11_include" = "-I/usr/include"; then
- x11_include=""
-@@ -2060,7 +2072,7 @@
- config CPPFLAGS "$common_cppflags $internal_cppflags"
- config OCAMLC_CFLAGS "$common_cflags $sharedcccompopts"
- config OCAMLC_CPPFLAGS "$common_cppflags"
--config LDFLAGS "$ldflags"
-+config LDFLAGS "$ldflags $LDFLAGS"
- config BYTECCLIBS "$cclibs $dllib $pthread_link $instrumented_runtime_libs"
- config RPATH "$rpath"
- config EXE "$exe"
+@@ -13526,6 +13528,8 @@ case $host in #(
+ arch=i386; system=beos ;; #(
+ i[3456]86-*-cygwin) :
+ arch=i386; system=cygwin ;; #(
++ i[3456]86-*-interix3) :
++ arch=i386; system=interix3 ;; #(
+ i[3456]86-*-darwin*) :
+ if $arch64; then :
+ arch=amd64
+@@ -13570,6 +13574,10 @@ fi; system=elf ;; #(
+ arch=arm; model=armv6; system=linux_eabi ;; #(
+ armv6*-*-freebsd*) :
+ arch=arm; model=armv6; system=freebsd ;; #(
++ armv6*-*-netbsd*) :
++ arch=arm; model=armv6; system=netbsd ;; #(
++ armv7*-*-netbsd*) :
++ arch=arm; model=armv7; system=netbsd ;; #(
+ earmv6*-*-netbsd*) :
+ arch=arm; model=armv6; system=netbsd ;; #(
+ earmv7*-*-netbsd*) :
+@@ -13602,6 +13610,8 @@ fi; system=elf ;; #(
+ arch=amd64; system=mingw64 ;; #(
+ aarch64-*-linux*) :
+ arch=arm64; system=linux ;; #(
++ aarch64-*-netbsd*) :
++ arch=arm64; system=netbsd ;; #(
+ x86_64-*-cygwin*) :
+ arch=amd64; system=cygwin
+ ;; #(
+@@ -13932,7 +13942,7 @@ fi
+ # for the moment, to be backward-compatible
+
+ case $host in #(
+- *-*-mingw32|*-pc-windows) :
++ *-*-mingw32|*-pc-windows|*-*-netbsd*) :
+ ;; #(
+ *) :
+ has_c99_float_ops=true
Index: pkgsrc/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile
diff -u pkgsrc/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile:1.9 pkgsrc/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile:1.10
--- pkgsrc/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile:1.9 Thu Jul 19 12:16:38 2018
+++ pkgsrc/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile Sat Aug 24 10:54:23 2019
@@ -1,40 +1,40 @@
-$NetBSD: patch-otherlibs_systhreads_Makefile,v 1.9 2018/07/19 12:16:38 jaapb Exp $
+$NetBSD: patch-otherlibs_systhreads_Makefile,v 1.10 2019/08/24 10:54:23 jaapb Exp $
Honor LDFLAGS.
-Use BSD_INSTALL_* instead of mkdir and cp
---- otherlibs/systhreads/Makefile.orig 2018-04-11 13:22:42.000000000 +0000
+--- otherlibs/systhreads/Makefile.orig 2019-03-01 15:13:46.000000000 +0000
+++ otherlibs/systhreads/Makefile
-@@ -28,6 +28,7 @@ export OCAML_FLEXLINK:=$(ROOTDIR)/boot/o
- endif
+@@ -21,6 +21,7 @@ include $(ROOTDIR)/Makefile.common
+ CAMLRUN ?= $(ROOTDIR)/boot/ocamlrun
LIBS = -nostdlib -I $(ROOTDIR)/stdlib -I $(ROOTDIR)/otherlibs/$(UNIXLIB)
-+LDOPTS=-ldopt "$(LDFLAGS)"
++LDOPTS= -ldopt "$(LDFLAGS)"
CAMLC=$(CAMLRUN) $(ROOTDIR)/ocamlc $(LIBS)
CAMLOPT=$(CAMLRUN) $(ROOTDIR)/ocamlopt $(LIBS)
-@@ -68,14 +69,14 @@ all: lib$(LIBNAME).$(A) $(LIBNAME).cma $
+@@ -61,7 +62,7 @@ all: lib$(LIBNAME).$(A) $(LIBNAME).cma $
allopt: lib$(LIBNAME)nat.$(A) $(LIBNAME).cmxa $(CMIFILES)
lib$(LIBNAME).$(A): $(BYTECODE_C_OBJS)
-- $(MKLIB) -o $(LIBNAME) $(BYTECODE_C_OBJS) $(PTHREAD_LINK)
-+ $(MKLIB) -o $(LIBNAME) $(BYTECODE_C_OBJS) $(PTHREAD_LINK) $(LDOPTS)
+- $(MKLIB_CMD) -o $(LIBNAME) $(BYTECODE_C_OBJS) $(PTHREAD_LINK)
++ $(MKLIB_CMD) -o $(LIBNAME) $(BYTECODE_C_OBJS) $(PTHREAD_LINK) $(LDOPTS)
lib$(LIBNAME)nat.$(A): $(NATIVECODE_C_OBJS)
- $(MKLIB) -o $(LIBNAME)nat $^
-
+ $(MKLIB_CMD) -o $(LIBNAME)nat $^
+@@ -69,7 +70,7 @@ lib$(LIBNAME)nat.$(A): $(NATIVECODE_C_OB
$(LIBNAME).cma: $(THREADS_BCOBJS)
ifeq "$(UNIX_OR_WIN32)" "unix"
-- $(MKLIB) -o $(LIBNAME) -ocamlc '$(CAMLC)' -cclib -lunix -linkall $(PTHREAD_CAML_LINK) $^
-+ $(MKLIB) -o $(LIBNAME) -ocamlc '$(CAMLC)' -cclib -lunix -linkall $(PTHREAD_CAML_LINK) $(LDOPTS) $^
+ $(MKLIB) -o $(LIBNAME) -ocamlc '$(CAMLC)' -cclib -lunix -linkall \
+- $(PTHREAD_CAML_LINK) $^
++ $(PTHREAD_CAML_LINK) $(LDOPTS) $^
# TODO: Figure out why -cclib -lunix is used here.
# It may be because of the threadsUnix module which is deprecated.
# It may hence be good to figure out whether this module shouldn't be
-@@ -122,7 +123,7 @@ install:
+@@ -117,7 +118,7 @@ install:
fi
$(INSTALL_DATA) libthreads.$(A) "$(INSTALL_LIBDIR)"
cd "$(INSTALL_LIBDIR)"; $(RANLIB) libthreads.$(A)
- mkdir -p "$(INSTALL_THREADSLIBDIR)"
+ $(BSD_INSTALL_LIB_DIR) "$(INSTALL_THREADSLIBDIR)"
$(INSTALL_DATA) \
- $(CMIFILES) $(CMIFILES:.cmi=.cmti) threads.cma \
+ $(CMIFILES) threads.cma \
"$(INSTALL_THREADSLIBDIR)"
Index: pkgsrc/lang/ocaml/patches/patch-otherlibs_threads_Makefile
diff -u pkgsrc/lang/ocaml/patches/patch-otherlibs_threads_Makefile:1.12 pkgsrc/lang/ocaml/patches/patch-otherlibs_threads_Makefile:1.13
--- pkgsrc/lang/ocaml/patches/patch-otherlibs_threads_Makefile:1.12 Thu Jul 19 12:16:38 2018
+++ pkgsrc/lang/ocaml/patches/patch-otherlibs_threads_Makefile Sat Aug 24 10:54:23 2019
@@ -1,18 +1,17 @@
-$NetBSD: patch-otherlibs_threads_Makefile,v 1.12 2018/07/19 12:16:38 jaapb Exp $
+$NetBSD: patch-otherlibs_threads_Makefile,v 1.13 2019/08/24 10:54:23 jaapb Exp $
Honor LDFLAGS.
-Use BSD_INSTALL_* instead of mkdir and cp
---- otherlibs/threads/Makefile.orig 2018-04-11 13:22:42.000000000 +0000
+--- otherlibs/threads/Makefile.orig 2019-02-08 14:34:10.000000000 +0000
+++ otherlibs/threads/Makefile
@@ -28,6 +28,7 @@ CAMLC=$(CAMLRUN) $(ROOTDIR)/ocamlc -nost
-I $(ROOTDIR)/stdlib -I $(ROOTDIR)/otherlibs/unix
- MKLIB=$(CAMLRUN) ../../tools/ocamlmklib
+ MKLIB=$(CAMLRUN) $(ROOTDIR)/tools/ocamlmklib
COMPFLAGS=-w +33..39 -warn-error A -bin-annot -g -safe-string
+LDOPTS= -ldopt $(LDFLAGS)
C_OBJS=scheduler.o
-@@ -64,7 +65,7 @@ all: libvmthreads.a threads.cma stdlib.c
+@@ -68,7 +69,7 @@ all: libvmthreads.a threads.cma stdlib.c
allopt:
libvmthreads.a: $(C_OBJS)
@@ -20,8 +19,8 @@ Use BSD_INSTALL_* instead of mkdir and c
+ $(MKLIB) -o threads -oc vmthreads $(C_OBJS) $(LDOPTS)
threads.cma: $(CAML_OBJS)
- $(MKLIB) -ocamlc '$(CAMLC)' -o threads -oc vmthreads $(CAML_OBJS)
-@@ -117,7 +118,7 @@ install:
+ $(MKLIB) -ocamlc '$(CAMLC)' -o threads -oc vmthreads $^
+@@ -121,7 +122,7 @@ install:
if test -f dllvmthreads.so; then \
$(INSTALL_PROG) dllvmthreads.so "$(INSTALL_STUBLIBDIR)"; \
fi
Index: pkgsrc/lang/ocaml/patches/patch-tools_ocamlmklib
diff -u pkgsrc/lang/ocaml/patches/patch-tools_ocamlmklib:1.7 pkgsrc/lang/ocaml/patches/patch-tools_ocamlmklib:1.8
--- pkgsrc/lang/ocaml/patches/patch-tools_ocamlmklib:1.7 Tue Jul 18 17:41:04 2017
+++ pkgsrc/lang/ocaml/patches/patch-tools_ocamlmklib Sat Aug 24 10:54:23 2019
@@ -1,10 +1,10 @@
-$NetBSD: patch-tools_ocamlmklib,v 1.7 2017/07/18 17:41:04 wiz Exp $
+$NetBSD: patch-tools_ocamlmklib,v 1.8 2019/08/24 10:54:23 jaapb Exp $
Add ELF mode support to ocamlmklib
---- tools/ocamlmklib.ml.orig 2017-06-23 15:13:40.000000000 +0000
+--- tools/ocamlmklib.ml.orig 2019-02-08 14:34:11.000000000 +0000
+++ tools/ocamlmklib.ml
-@@ -28,6 +28,7 @@ and c_objs = ref [] (* .o, .a, .
+@@ -43,6 +43,7 @@ and c_objs = ref [] (* .o, .a, .
and caml_libs = ref [] (* -cclib to pass to ocamlc, ocamlopt *)
and caml_opts = ref [] (* -ccopt to pass to ocamlc, ocamlopt *)
and dynlink = ref supports_shared_libraries
@@ -12,37 +12,37 @@ Add ELF mode support to ocamlmklib
and failsafe = ref false (* whether to fall back on static build only *)
and c_libs = ref [] (* libs to pass to mksharedlib and ocamlc -cclib *)
and c_Lopts = ref [] (* options to pass to mksharedlib and ocamlc -cclib *)
-@@ -84,6 +85,8 @@ let parse_arguments argv =
+@@ -110,6 +111,8 @@ let parse_arguments argv =
c_objs := s :: !c_objs
else if s = "-cclib" then
- caml_libs := next_arg () :: "-cclib" :: !caml_libs
-+ else if starts_with s "-Wl,-z" then
-+ c_libs := s :: !c_libs
+ caml_libs := next_arg s :: "-cclib" :: !caml_libs
++ else if starts_with s "-Wl,-z" then
++ c_libs := s :: !c_libs
else if s = "-ccopt" then
- caml_opts := next_arg () :: "-ccopt" :: !caml_opts
+ caml_opts := next_arg s :: "-ccopt" :: !caml_opts
else if s = "-custom" then
-@@ -104,8 +107,9 @@ let parse_arguments argv =
+@@ -136,8 +139,9 @@ let parse_arguments argv =
c_libs := s :: !c_libs
else if starts_with s "-L" then
(c_Lopts := s :: !c_Lopts;
- let l = chop_prefix s "-L" in
- if not (Filename.is_relative l) then rpath := l :: !rpath)
-+ if not !elfmode then
++ if not !elfmode then
+ (let l = chop_prefix s "-L" in
+ if not (Filename.is_relative l) then rpath := l :: !rpath))
else if s = "-ocamlcflags" then
- ocamlc_opts := next_arg () :: !ocamlc_opts
+ ocamlc_opts := next_arg s :: !ocamlc_opts
else if s = "-ocamlc" then
-@@ -120,6 +124,8 @@ let parse_arguments argv =
- output_c := next_arg()
+@@ -152,6 +156,8 @@ let parse_arguments argv =
+ output_c := next_arg s
else if s = "-dllpath" || s = "-R" || s = "-rpath" then
- rpath := next_arg() :: !rpath
-+ else if s = "-elfmode" then
+ rpath := next_arg s :: !rpath
++ else if s = "-elfmode" then
+ elfmode := true
else if starts_with s "-R" then
rpath := chop_prefix s "-R" :: !rpath
else if s = "-Wl,-rpath" then
-@@ -165,6 +171,7 @@ Usage: ocamlmklib [options] <.cmo|.cma|.
+@@ -200,6 +206,7 @@ Usage: ocamlmklib [options] <.cmo|.cma|.
\n -custom Disable dynamic loading\
\n -g Build with debug information\
\n -dllpath <dir> Add <dir> to the run-time search path for DLLs\
Added files:
Index: pkgsrc/lang/ocaml/patches/patch-Makefile.common.in
diff -u /dev/null pkgsrc/lang/ocaml/patches/patch-Makefile.common.in:1.1
--- /dev/null Sat Aug 24 10:54:24 2019
+++ pkgsrc/lang/ocaml/patches/patch-Makefile.common.in Sat Aug 24 10:54:23 2019
@@ -0,0 +1,18 @@
+$NetBSD: patch-Makefile.common.in,v 1.1 2019/08/24 10:54:23 jaapb Exp $
+
+Use BSD_INSTALL_*
+--- Makefile.common.in.orig 2019-03-01 15:13:45.000000000 +0000
++++ Makefile.common.in
+@@ -16,9 +16,9 @@
+ # This makefile contains common definitions shared by other Makefiles
+ # We assume that Makefile.config has already been included
+
+-INSTALL ?= @INSTALL@
+-INSTALL_DATA ?= $(INSTALL) -m u=rw,g=rw,o=r
+-INSTALL_PROG ?= $(INSTALL) -m u=rwx,g=rwx,o=rx
++INSTALL ?= $(BSD_INSTALL)
++INSTALL_DATA ?= $(BSD_INSTALL_DATA)
++INSTALL_PROG ?= $(BSD_INSTALL_SCRIPT)
+
+ # note: these are defined by lazy expansions
+ # as some parts of the makefiles change BINDIR, etc.
Index: pkgsrc/lang/ocaml/patches/patch-lex_Makefile
diff -u /dev/null pkgsrc/lang/ocaml/patches/patch-lex_Makefile:1.1
--- /dev/null Sat Aug 24 10:54:24 2019
+++ pkgsrc/lang/ocaml/patches/patch-lex_Makefile Sat Aug 24 10:54:23 2019
@@ -0,0 +1,23 @@
+$NetBSD: patch-lex_Makefile,v 1.1 2019/08/24 10:54:23 jaapb Exp $
+
+Honor LDFLAGS.
+--- lex/Makefile.orig 2019-03-01 15:13:45.000000000 +0000
++++ lex/Makefile
+@@ -28,7 +28,7 @@ CAMLC = $(CAMLRUN) $(ROOTDIR)/boot/ocaml
+ CAMLOPT = $(CAMLRUN) $(ROOTDIR)/ocamlopt -nostdlib -I $(ROOTDIR)/stdlib
+ COMPFLAGS = $(INCLUDES) -absname -w +a-4-9-41-42-44-45-48 -warn-error A \
+ -safe-string -strict-sequence -strict-formats -bin-annot
+-LINKFLAGS =
++LINKFLAGS = -cclib "$(LDFLAGS)"
+ YACCFLAGS = -v
+ CAMLLEX = $(CAMLRUN) $(ROOTDIR)/boot/ocamllex
+ CAMLDEP = $(CAMLRUN) $(ROOTDIR)/boot/ocamlc -depend
+@@ -47,7 +47,7 @@ ocamllex: $(OBJS)
+ $(CAMLC) $(LINKFLAGS) -compat-32 -o ocamllex $(OBJS)
+
+ ocamllex.opt: $(OBJS:.cmo=.cmx)
+- $(CAMLOPT_CMD) -o ocamllex.opt $(OBJS:.cmo=.cmx)
++ $(CAMLOPT_CMD) $(LINKFLAGS) -o ocamllex.opt $(OBJS:.cmo=.cmx)
+
+ clean::
+ rm -f ocamllex ocamllex.opt
Index: pkgsrc/lang/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common
diff -u /dev/null pkgsrc/lang/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common:1.1
--- /dev/null Sat Aug 24 10:54:24 2019
+++ pkgsrc/lang/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common Sat Aug 24 10:54:23 2019
@@ -0,0 +1,13 @@
+$NetBSD: patch-otherlibs_Makefile.otherlibs.common,v 1.1 2019/08/24 10:54:23 jaapb Exp $
+
+Honor LDFLAGS.
+--- otherlibs/Makefile.otherlibs.common.orig 2019-02-08 14:34:10.000000000 +0000
++++ otherlibs/Makefile.otherlibs.common
+@@ -48,6 +48,7 @@ MKLIB=$(CAMLRUN) $(ROOTDIR)/tools/ocamlm
+ #LINKOPTS=
+ #LDOPTS=
+ #HEADERS=
++LDOPTS= -ldopt "$(LDFLAGS)"
+
+ CMIFILES ?= $(CAMLOBJS:.cmo=.cmi)
+ CAMLOBJS_NAT ?= $(CAMLOBJS:.cmo=.cmx)
Index: pkgsrc/lang/ocaml/patches/patch-runtime_Makefile
diff -u /dev/null pkgsrc/lang/ocaml/patches/patch-runtime_Makefile:1.1
--- /dev/null Sat Aug 24 10:54:24 2019
+++ pkgsrc/lang/ocaml/patches/patch-runtime_Makefile Sat Aug 24 10:54:23 2019
@@ -0,0 +1,53 @@
+$NetBSD: patch-runtime_Makefile,v 1.1 2019/08/24 10:54:23 jaapb Exp $
+
+Honor LDFLAGS.
+--- runtime/Makefile.orig 2019-04-18 10:10:54.000000000 +0000
++++ runtime/Makefile
+@@ -182,11 +182,11 @@ LIBS = $(BYTECCLIBS) $(EXTRALIBS)
+ ifdef BOOTSTRAPPING_FLEXLINK
+ MAKE_OCAMLRUN=$(MKEXE_BOOT)
+ else
+-MAKE_OCAMLRUN = $(MKEXE) -o $(1) $(2)
++MAKE_OCAMLRUN = $(MKEXE) $(LDFLAGS) -o $(1) $(2)
+ endif
+ else
+ LIBS = $(BYTECCLIBS)
+-MAKE_OCAMLRUN = $(MKEXE) -o $(1) $(2)
++MAKE_OCAMLRUN = $(MKEXE) $(LDFLAGS) -o $(1) $(2)
+ endif
+
+ # Build, install and clean targets
+@@ -292,13 +292,13 @@ libcamlrun.$(A): $(libcamlrun_OBJECTS)
+ $(call MKLIB,$@, $^)
+
+ ocamlrund$(EXE): prims.$(O) libcamlrund.$(A)
+- $(MKEXE) $(MKEXEDEBUGFLAG) -o $@ $^ $(LIBS)
++ $(MKEXE) $(LDFLAGS) $(MKEXEDEBUGFLAG) -o $@ $^ $(LIBS)
+
+ libcamlrund.$(A): $(libcamlrund_OBJECTS)
+ $(call MKLIB,$@, $^)
+
+ ocamlruni$(EXE): prims.$(O) libcamlruni.$(A)
+- $(MKEXE) -o $@ $^ $(LIBS)
++ $(MKEXE) $(LDFLAGS) -o $@ $^ $(LIBS)
+
+ libcamlruni.$(A): $(libcamlruni_OBJECTS)
+ $(call MKLIB,$@, $^)
+@@ -307,7 +307,7 @@ libcamlrun_pic.$(A): $(libcamlrunpic_OBJ
+ $(call MKLIB,$@, $^)
+
+ libcamlrun_shared.$(SO): $(libcamlrunpic_OBJECTS)
+- $(MKDLL) -o $@ $^ $(BYTECCLIBS)
++ $(MKDLL) $(LDFLAGS) -o $@ $^ $(BYTECCLIBS)
+
+ libasmrun.$(A): $(libasmrun_OBJECTS)
+ $(call MKLIB,$@, $^)
+@@ -325,7 +325,7 @@ libasmrun_pic.$(A): $(libasmrunpic_OBJEC
+ $(call MKLIB,$@, $^)
+
+ libasmrun_shared.$(SO): $(libasmrunpic_OBJECTS)
+- $(MKDLL) -o $@ $^ $(NATIVECCLIBS)
++ $(MKDLL) $(LDFLAGS) -o $@ $^ $(NATIVECCLIBS)
+
+ # Target-specific preprocessor and compiler flags
+
Index: pkgsrc/lang/ocaml/patches/patch-tools_Makefile
diff -u /dev/null pkgsrc/lang/ocaml/patches/patch-tools_Makefile:1.1
--- /dev/null Sat Aug 24 10:54:24 2019
+++ pkgsrc/lang/ocaml/patches/patch-tools_Makefile Sat Aug 24 10:54:23 2019
@@ -0,0 +1,14 @@
+$NetBSD: patch-tools_Makefile,v 1.1 2019/08/24 10:54:23 jaapb Exp $
+
+Honor LDFLAGS.
+--- tools/Makefile.orig 2019-03-01 15:13:46.000000000 +0000
++++ tools/Makefile
+@@ -81,7 +81,7 @@ INCLUDES = $(addprefix -I $(ROOTDIR)/,ut
+ middle_end middle_end/base_types driver toplevel)
+ COMPFLAGS = -absname -w +a-4-9-41-42-44-45-48 -strict-sequence -warn-error A \
+ -safe-string -strict-formats -bin-annot $(INCLUDES)
+-LINKFLAGS = $(INCLUDES)
++LINKFLAGS = $(INCLUDES) -cclib "$(LDFLAGS)"
+ VPATH := $(filter-out -I,$(INCLUDES))
+
+ # scrapelabels addlabels
Index: pkgsrc/lang/ocaml/patches/patch-ocamldoc_Makefile
diff -u /dev/null pkgsrc/lang/ocaml/patches/patch-ocamldoc_Makefile:1.7
--- /dev/null Sat Aug 24 10:54:24 2019
+++ pkgsrc/lang/ocaml/patches/patch-ocamldoc_Makefile Sat Aug 24 10:54:23 2019
@@ -0,0 +1,14 @@
+$NetBSD: patch-ocamldoc_Makefile,v 1.7 2019/08/24 10:54:23 jaapb Exp $
+
+Honor LDFLAGS.
+--- ocamldoc/Makefile.orig 2019-03-01 15:13:46.000000000 +0000
++++ ocamldoc/Makefile
+@@ -104,7 +104,7 @@ DEPINCLUDES=$(INCLUDES_DEP)
+ INCLUDES=$(INCLUDES_DEP) $(INCLUDES_NODEP)
+
+ COMPFLAGS=$(INCLUDES) -absname -w +a-4-9-41-42-44-45-48 -warn-error A -safe-string -strict-sequence -strict-formats -bin-annot
+-LINKFLAGS=$(INCLUDES) -nostdlib
++LINKFLAGS=$(INCLUDES) -nostdlib -cclib "$(LDFLAGS)"
+
+ CMOFILES=\
+ odoc_config.cmo \
Home |
Main Index |
Thread Index |
Old Index