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: Tue May 24 18:25:38 UTC 2022
Modified Files:
pkgsrc/lang/ocaml: Makefile Makefile.common PLIST buildlink3.mk
distinfo options.mk
pkgsrc/lang/ocaml/patches: patch-Makefile patch-configure
patch-lex_Makefile patch-man_Makefile patch-ocamldoc_Makefile
patch-otherlibs_Makefile.otherlibs.common
patch-otherlibs_systhreads_Makefile patch-otherlibs_unix_Makefile
patch-runtime_Makefile patch-tools_Makefile
patch-tools_ocamlmklib.ml patch-yacc_Makefile
Added Files:
pkgsrc/lang/ocaml: native.mk ocaml.mk
pkgsrc/lang/ocaml/patches: patch-Makefile.build_config.in
patch-api__docgen_ocamldoc_Makefile patch-runtime_floats.c
patch-runtime_sak.c
Removed Files:
pkgsrc/lang/ocaml/patches: patch-Makefile.common.in
Log Message:
Updated lang/ocaml to version 4.14.0.
This is a long-overdue update, so there are many changes. Details are in
the Changes file in the distribution.
The mk/ocaml file will be moved to lang/ocaml and the logic for selecting
whether to use the native-code compiler will be factored out into
native.mk to avoid duplications.
This is the final version before OCaml 5.0 arrives, which has
multicore support and should be a major change from the 4.x versions.
To generate a diff of this commit:
cvs rdiff -u -r1.143 -r1.144 pkgsrc/lang/ocaml/Makefile
cvs rdiff -u -r1.63 -r1.64 pkgsrc/lang/ocaml/Makefile.common
cvs rdiff -u -r1.56 -r1.57 pkgsrc/lang/ocaml/PLIST \
pkgsrc/lang/ocaml/buildlink3.mk
cvs rdiff -u -r1.144 -r1.145 pkgsrc/lang/ocaml/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/ocaml/native.mk pkgsrc/lang/ocaml/ocaml.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/ocaml/options.mk
cvs rdiff -u -r1.16 -r1.17 pkgsrc/lang/ocaml/patches/patch-Makefile
cvs rdiff -u -r0 -r1.1 \
pkgsrc/lang/ocaml/patches/patch-Makefile.build_config.in \
pkgsrc/lang/ocaml/patches/patch-api__docgen_ocamldoc_Makefile \
pkgsrc/lang/ocaml/patches/patch-runtime_floats.c \
pkgsrc/lang/ocaml/patches/patch-runtime_sak.c
cvs rdiff -u -r1.3 -r0 pkgsrc/lang/ocaml/patches/patch-Makefile.common.in
cvs rdiff -u -r1.43 -r1.44 pkgsrc/lang/ocaml/patches/patch-configure
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/ocaml/patches/patch-lex_Makefile \
pkgsrc/lang/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common \
pkgsrc/lang/ocaml/patches/patch-otherlibs_unix_Makefile \
pkgsrc/lang/ocaml/patches/patch-runtime_Makefile \
pkgsrc/lang/ocaml/patches/patch-tools_Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/ocaml/patches/patch-man_Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/ocaml/patches/patch-ocamldoc_Makefile
cvs rdiff -u -r1.12 -r1.13 \
pkgsrc/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/ocaml/patches/patch-tools_ocamlmklib.ml
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/ocaml/patches/patch-yacc_Makefile
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.143 pkgsrc/lang/ocaml/Makefile:1.144
--- pkgsrc/lang/ocaml/Makefile:1.143 Sat Mar 26 19:19:07 2022
+++ pkgsrc/lang/ocaml/Makefile Tue May 24 18:25:38 2022
@@ -1,11 +1,7 @@
-# $NetBSD: Makefile,v 1.143 2022/03/26 19:19:07 jaapb Exp $
+# $NetBSD: Makefile,v 1.144 2022/05/24 18:25:38 jaapb Exp $
.include "Makefile.common"
-#CONFIGURE_ENV+= disable_x11=yes
-PKGREVISION= 1
-
-BUILD_TARGET= world
TEST_PROGRAM= ocamltest
MAKE_JOBS_SAFE= no
UNLIMIT_RESOURCES= stacksize
@@ -17,63 +13,17 @@ USE_GNU_CONFIGURE_HOST= no
#USE_GCC_RUNTIME= yes
-PLIST_VARS+= ocaml-stub ocaml-prof ocaml-opt ocaml-nat ocaml-spacetime \
- instrumented_runtime
-
.include "options.mk"
-###
-### PLIST components
-###
-
-# Stub libraries for functions missing from base system.
-.if !empty(MACHINE_PLATFORM:MDarwin-*-powerpc) || \
- !empty(MACHINE_PLATFORM:MDarwin-9.*-i386) || \
- !empty(MACHINE_PLATFORM:MDarwin-1[0-9].*) || \
- ${OPSYS} == "DragonFly" || ${OPSYS} == "NetBSD" || \
- ${OPSYS} == "FreeBSD" || ${OPSYS} == "SunOS" || \
- ${OPSYS} == "Linux"
-PLIST.ocaml-stub= yes
-.endif
+.include "native.mk"
-# Optional components built only on certain platforms.
-.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
- !empty(MACHINE_ARCH:M*arm*) || (${MACHINE_ARCH} == "aarch64") || \
- (${MACHINE_ARCH} == "x86_64")
-BUILD_TARGET+= opt opt.opt
-TEST_PROGRAM+= ocamltest.opt
-PLIST.ocaml-opt= yes
-. if empty(MACHINE_PLATFORM:MDarwin-*-powerpc) && \
- empty(MACHINE_PLATFORM:MSunOS-*-i386) && \
- (${MACHINE_ARCH} != "aarch64")
-PLIST.ocaml-prof= yes
-. endif
-.endif
+# Options
-# XXX This conditional is not complete. It should match the
-# conditional in ocaml-x.y.z/configure.
-.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "x86_64") || \
- (${MACHINE_ARCH} == "aarch64") || (${MACHINE_ARCH} == "powerpc") || \
- !empty(MACHINE_ARCH:Mearm*)
-. if !empty(MACHINE_PLATFORM:MLinux-*-*) || \
- !empty(MACHINE_PLATFORM:MFreeBSD-*-*) || \
- !empty(MACHINE_PLATFORM:MDragonFly-*-*) || \
- !empty(MACHINE_PLATFORM:MNetBSD-*-*) || \
- !empty(MACHINE_PLATFORM:MDarwin-*-*) || \
- !empty(MACHINE_PLATFORM:MSunOS-*-*)
-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
-.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" || ${OPSYS_VERSION} >= 101200
-PLIST.instrumented_runtime= yes
+.if ${OCAML_USE_OPT_COMPILER} == "yes"
+CONFIGURE_ARGS+= --enable-native-compiler
+BUILD_TARGET= world.opt
+.else
+CONFIGURE_ARGS+= --disable-native-compiler
+BUILD_TARGET= world
.endif
# This is needed because ${WRKSRC}/build/partial-install.sh uses
@@ -87,7 +37,7 @@ PLIST.instrumented_runtime= yes
INSTALL_MAKE_FLAGS+= SHELL=${SH:Q}
.endif
-#INSTALLATION_DIRS= ${PKGMANDIR}/man1
+INSTALLATION_DIRS= share/doc/ocaml
OPSYSVARS+= EXTRA_RT_LIBS
EXTRA_RT_LIBS.NetBSD= -lcurses
@@ -109,13 +59,6 @@ fix-darwin-install-name:
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"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/lang/ocaml/Makefile.common
diff -u pkgsrc/lang/ocaml/Makefile.common:1.63 pkgsrc/lang/ocaml/Makefile.common:1.64
--- pkgsrc/lang/ocaml/Makefile.common:1.63 Thu Sep 30 11:08:57 2021
+++ pkgsrc/lang/ocaml/Makefile.common Tue May 24 18:25:38 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.63 2021/09/30 11:08:57 nia Exp $
+# $NetBSD: Makefile.common,v 1.64 2022/05/24 18:25:38 jaapb Exp $
# used by x11/labltk/Makefile
-DISTNAME= ocaml-4.11.2
+DISTNAME= ocaml-4.14.0
CATEGORIES= lang
-MASTER_SITES= http://caml.inria.fr/pub/distrib/ocaml-4.11/
+MASTER_SITES= http://caml.inria.fr/pub/distrib/ocaml-4.14/
#EXTRACT_SUFX= .tar.bz2
MAINTAINER= jaapb%NetBSD.org@localhost
Index: pkgsrc/lang/ocaml/PLIST
diff -u pkgsrc/lang/ocaml/PLIST:1.56 pkgsrc/lang/ocaml/PLIST:1.57
--- pkgsrc/lang/ocaml/PLIST:1.56 Sat Mar 26 19:19:07 2022
+++ pkgsrc/lang/ocaml/PLIST Tue May 24 18:25:38 2022
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.56 2022/03/26 19:19:07 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.57 2022/05/24 18:25:38 jaapb Exp $
bin/ocaml
-@comment ${PLIST.instrumented_runtime}bin/ocaml-instr-graph
-@comment ${PLIST.instrumented_runtime}bin/ocaml-instr-report
bin/ocamlc
bin/ocamlc.byte
${PLIST.ocaml-opt}bin/ocamlc.opt
@@ -38,23 +36,24 @@ bin/ocamlprof.byte
${PLIST.ocaml-opt}bin/ocamlprof.opt
bin/ocamlrun
bin/ocamlrund
-${PLIST.instrumented_runtime}bin/ocamlruni
+bin/ocamlruni
bin/ocamlyacc
lib/ocaml/Makefile.config
-lib/ocaml/VERSION
lib/ocaml/arg.ml
lib/ocaml/arg.mli
lib/ocaml/array.ml
lib/ocaml/array.mli
lib/ocaml/arrayLabels.ml
lib/ocaml/arrayLabels.mli
+lib/ocaml/atomic.ml
+lib/ocaml/atomic.mli
${PLIST.ocaml-opt}lib/ocaml/bigarray.a
lib/ocaml/bigarray.cma
lib/ocaml/bigarray.cmi
lib/ocaml/bigarray.cmti
${PLIST.ocaml-opt}lib/ocaml/bigarray.cmx
${PLIST.ocaml-opt}lib/ocaml/bigarray.cmxa
-${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/ocaml/bigarray.cmxs
+${PLIST.ocaml-opt}lib/ocaml/bigarray.cmxs
lib/ocaml/bigarray.ml
lib/ocaml/bigarray.mli
lib/ocaml/bool.ml
@@ -97,9 +96,6 @@ lib/ocaml/caml/hash.h
lib/ocaml/caml/hooks.h
lib/ocaml/caml/instrtrace.h
lib/ocaml/caml/instruct.h
-@comment 4.09 lib/ocaml/caml/int64_emul.h
-@comment 4.09 lib/ocaml/caml/int64_format.h
-@comment 4.09 lib/ocaml/caml/int64_native.h
lib/ocaml/caml/interp.h
lib/ocaml/caml/intext.h
lib/ocaml/caml/io.h
@@ -123,7 +119,6 @@ lib/ocaml/caml/signals.h
lib/ocaml/caml/signals_machdep.h
lib/ocaml/caml/skiplist.h
lib/ocaml/caml/socketaddr.h
-lib/ocaml/caml/spacetime.h
lib/ocaml/caml/stack.h
lib/ocaml/caml/stacks.h
lib/ocaml/caml/startup.h
@@ -134,50 +129,47 @@ lib/ocaml/caml/ui.h
lib/ocaml/caml/unixsupport.h
lib/ocaml/caml/version.h
lib/ocaml/caml/weak.h
+lib/ocaml/caml/winsupport.h
lib/ocaml/camlheader
lib/ocaml/camlheader_ur
lib/ocaml/camlheaderd
lib/ocaml/camlheaderi
+lib/ocaml/camlinternalAtomic.cmi
+lib/ocaml/camlinternalAtomic.cmt
+lib/ocaml/camlinternalAtomic.cmti
+${PLIST.ocaml-opt}lib/ocaml/camlinternalAtomic.cmx
+lib/ocaml/camlinternalAtomic.ml
+lib/ocaml/camlinternalAtomic.mli
lib/ocaml/camlinternalFormat.cmi
lib/ocaml/camlinternalFormat.cmt
lib/ocaml/camlinternalFormat.cmti
${PLIST.ocaml-opt}lib/ocaml/camlinternalFormat.cmx
lib/ocaml/camlinternalFormat.ml
lib/ocaml/camlinternalFormat.mli
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/camlinternalFormat.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/camlinternalFormat.p.cmx
lib/ocaml/camlinternalFormatBasics.cmi
lib/ocaml/camlinternalFormatBasics.cmt
lib/ocaml/camlinternalFormatBasics.cmti
${PLIST.ocaml-opt}lib/ocaml/camlinternalFormatBasics.cmx
lib/ocaml/camlinternalFormatBasics.ml
lib/ocaml/camlinternalFormatBasics.mli
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/camlinternalFormatBasics.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/camlinternalFormatBasics.p.cmx
lib/ocaml/camlinternalLazy.cmi
lib/ocaml/camlinternalLazy.cmt
lib/ocaml/camlinternalLazy.cmti
${PLIST.ocaml-opt}lib/ocaml/camlinternalLazy.cmx
lib/ocaml/camlinternalLazy.ml
lib/ocaml/camlinternalLazy.mli
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/camlinternalLazy.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/camlinternalLazy.p.cmx
lib/ocaml/camlinternalMod.cmi
lib/ocaml/camlinternalMod.cmt
lib/ocaml/camlinternalMod.cmti
${PLIST.ocaml-opt}lib/ocaml/camlinternalMod.cmx
lib/ocaml/camlinternalMod.ml
lib/ocaml/camlinternalMod.mli
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/camlinternalMod.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/camlinternalMod.p.cmx
lib/ocaml/camlinternalOO.cmi
lib/ocaml/camlinternalOO.cmt
lib/ocaml/camlinternalOO.cmti
${PLIST.ocaml-opt}lib/ocaml/camlinternalOO.cmx
lib/ocaml/camlinternalOO.ml
lib/ocaml/camlinternalOO.mli
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/camlinternalOO.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/camlinternalOO.p.cmx
lib/ocaml/char.ml
lib/ocaml/char.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/CSE.cmi
@@ -267,11 +259,6 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-lib
${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/available_regs.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/available_regs.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/available_regs.cmti
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/available_regs.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/available_regs.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
@@ -280,6 +267,11 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-lib
${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
+lib/ocaml/compiler-libs/binutils.cmi
+lib/ocaml/compiler-libs/binutils.cmt
+lib/ocaml/compiler-libs/binutils.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/binutils.cmx
+lib/ocaml/compiler-libs/binutils.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
@@ -413,6 +405,11 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-lib
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm_helpers.cmti
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm_helpers.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm_helpers.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm_invariants.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm_invariants.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm_invariants.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm_invariants.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm_invariants.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen.cmti
@@ -450,26 +447,6 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-lib
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/comballoc.cmti
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/comballoc.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/comballoc.mli
-@comment 4.09 lib/ocaml/compiler-libs/compdynlink.cmi
-@comment 4.09 lib/ocaml/compiler-libs/compdynlink.cmt
-@comment 4.09 lib/ocaml/compiler-libs/compdynlink.cmti
-@comment 4.09 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compdynlink.cmx
-@comment 4.09 lib/ocaml/compiler-libs/compdynlink.mli
-@comment 4.09 lib/ocaml/compiler-libs/compdynlink_common.cmi
-@comment 4.09 lib/ocaml/compiler-libs/compdynlink_common.cmt
-@comment 4.09 lib/ocaml/compiler-libs/compdynlink_common.cmti
-@comment 4.09 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compdynlink_common.cmx
-@comment 4.09 lib/ocaml/compiler-libs/compdynlink_common.mli
-@comment 4.09 lib/ocaml/compiler-libs/compdynlink_platform_intf.cmi
-@comment 4.09 lib/ocaml/compiler-libs/compdynlink_platform_intf.cmt
-@comment 4.09 lib/ocaml/compiler-libs/compdynlink_platform_intf.cmti
-@comment 4.09 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compdynlink_platform_intf.cmx
-@comment 4.09 lib/ocaml/compiler-libs/compdynlink_platform_intf.mli
-@comment 4.09 lib/ocaml/compiler-libs/compdynlink_types.cmi
-@comment 4.09 lib/ocaml/compiler-libs/compdynlink_types.cmt
-@comment 4.09 lib/ocaml/compiler-libs/compdynlink_types.cmti
-@comment 4.09 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compdynlink_types.cmx
-@comment 4.09 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
@@ -500,14 +477,6 @@ lib/ocaml/compiler-libs/compmisc.cmt
lib/ocaml/compiler-libs/compmisc.cmti
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compmisc.cmx
lib/ocaml/compiler-libs/compmisc.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compute_ranges.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compute_ranges.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compute_ranges.cmti
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compute_ranges.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compute_ranges.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compute_ranges_intf.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compute_ranges_intf.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compute_ranges_intf.cmx
lib/ocaml/compiler-libs/config.cmi
lib/ocaml/compiler-libs/config.cmt
lib/ocaml/compiler-libs/config.cmti
@@ -528,6 +497,11 @@ lib/ocaml/compiler-libs/ctype.cmt
lib/ocaml/compiler-libs/ctype.cmti
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ctype.cmx
lib/ocaml/compiler-libs/ctype.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/dataflow.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/dataflow.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/dataflow.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/dataflow.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/dataflow.mli
lib/ocaml/compiler-libs/datarepr.cmi
lib/ocaml/compiler-libs/datarepr.cmt
lib/ocaml/compiler-libs/datarepr.cmti
@@ -548,6 +522,16 @@ lib/ocaml/compiler-libs/depend.cmt
lib/ocaml/compiler-libs/depend.cmti
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/depend.cmx
lib/ocaml/compiler-libs/depend.mli
+lib/ocaml/compiler-libs/diffing.cmi
+lib/ocaml/compiler-libs/diffing.cmt
+lib/ocaml/compiler-libs/diffing.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/diffing.cmx
+lib/ocaml/compiler-libs/diffing.mli
+lib/ocaml/compiler-libs/diffing_with_keys.cmi
+lib/ocaml/compiler-libs/diffing_with_keys.cmt
+lib/ocaml/compiler-libs/diffing_with_keys.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/diffing_with_keys.cmx
+lib/ocaml/compiler-libs/diffing_with_keys.mli
lib/ocaml/compiler-libs/dll.cmi
lib/ocaml/compiler-libs/dll.cmt
lib/ocaml/compiler-libs/dll.cmti
@@ -583,6 +567,9 @@ lib/ocaml/compiler-libs/emitcode.cmt
lib/ocaml/compiler-libs/emitcode.cmti
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/emitcode.cmx
lib/ocaml/compiler-libs/emitcode.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/emitenv.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/emitenv.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/emitenv.mli
lib/ocaml/compiler-libs/env.cmi
lib/ocaml/compiler-libs/env.cmt
lib/ocaml/compiler-libs/env.cmti
@@ -598,6 +585,11 @@ lib/ocaml/compiler-libs/errors.cmt
lib/ocaml/compiler-libs/errors.cmti
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/errors.cmx
lib/ocaml/compiler-libs/errors.mli
+lib/ocaml/compiler-libs/errortrace.cmi
+lib/ocaml/compiler-libs/errortrace.cmt
+lib/ocaml/compiler-libs/errortrace.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/errortrace.cmx
+lib/ocaml/compiler-libs/errortrace.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
@@ -663,6 +655,7 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-lib
lib/ocaml/compiler-libs/genprintval.cmi
lib/ocaml/compiler-libs/genprintval.cmt
lib/ocaml/compiler-libs/genprintval.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/genprintval.cmx
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
@@ -699,6 +692,11 @@ lib/ocaml/compiler-libs/includemod.cmt
lib/ocaml/compiler-libs/includemod.cmti
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/includemod.cmx
lib/ocaml/compiler-libs/includemod.mli
+lib/ocaml/compiler-libs/includemod_errorprinter.cmi
+lib/ocaml/compiler-libs/includemod_errorprinter.cmt
+lib/ocaml/compiler-libs/includemod_errorprinter.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/includemod_errorprinter.cmx
+lib/ocaml/compiler-libs/includemod_errorprinter.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
@@ -782,6 +780,11 @@ lib/ocaml/compiler-libs/lambda.cmt
lib/ocaml/compiler-libs/lambda.cmti
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lambda.cmx
lib/ocaml/compiler-libs/lambda.mli
+lib/ocaml/compiler-libs/lazy_backtrack.cmi
+lib/ocaml/compiler-libs/lazy_backtrack.cmt
+lib/ocaml/compiler-libs/lazy_backtrack.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lazy_backtrack.cmx
+lib/ocaml/compiler-libs/lazy_backtrack.mli
lib/ocaml/compiler-libs/lexer.cmi
lib/ocaml/compiler-libs/lexer.cmt
lib/ocaml/compiler-libs/lexer.cmti
@@ -807,6 +810,11 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-lib
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linear.cmti
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linear.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linear.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linear_format.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linear_format.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linear_format.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linear_format.cmx
+lib/ocaml/compiler-libs/linear_format.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linearize.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linearize.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linearize.cmti
@@ -832,6 +840,11 @@ 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/local_store.cmi
+lib/ocaml/compiler-libs/local_store.cmt
+lib/ocaml/compiler-libs/local_store.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/local_store.cmx
+lib/ocaml/compiler-libs/local_store.mli
lib/ocaml/compiler-libs/location.cmi
lib/ocaml/compiler-libs/location.cmt
lib/ocaml/compiler-libs/location.cmti
@@ -850,15 +863,18 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-lib
lib/ocaml/compiler-libs/main.cmi
lib/ocaml/compiler-libs/main.cmo
lib/ocaml/compiler-libs/main.cmt
-lib/ocaml/compiler-libs/main.cmti
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/main.cmx
-lib/ocaml/compiler-libs/main.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/main.o
lib/ocaml/compiler-libs/main_args.cmi
lib/ocaml/compiler-libs/main_args.cmt
lib/ocaml/compiler-libs/main_args.cmti
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/main_args.cmx
lib/ocaml/compiler-libs/main_args.mli
+lib/ocaml/compiler-libs/maindriver.cmi
+lib/ocaml/compiler-libs/maindriver.cmt
+lib/ocaml/compiler-libs/maindriver.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/maindriver.cmx
+lib/ocaml/compiler-libs/maindriver.mli
lib/ocaml/compiler-libs/makedepend.cmi
lib/ocaml/compiler-libs/makedepend.cmt
lib/ocaml/compiler-libs/makedepend.cmti
@@ -906,7 +922,9 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-lib
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamloptcomp.a
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamloptcomp.cma
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamloptcomp.cmxa
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamltoplevel.a
lib/ocaml/compiler-libs/ocamltoplevel.cma
+${PLIST.ocaml-opt}${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamltoplevel.cmxa
lib/ocaml/compiler-libs/opcodes.cmi
lib/ocaml/compiler-libs/opcodes.cmt
lib/ocaml/compiler-libs/opcodes.cmti
@@ -930,13 +948,13 @@ lib/ocaml/compiler-libs/opterrors.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/optmain.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/optmain.cmo
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/optmain.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/optmain.cmti
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/optmain.cmx
-lib/ocaml/compiler-libs/optmain.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/optmain.o
-lib/ocaml/compiler-libs/opttopdirs.mli
-lib/ocaml/compiler-libs/opttoploop.mli
-lib/ocaml/compiler-libs/opttopmain.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/optmaindriver.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/optmaindriver.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/optmaindriver.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/optmaindriver.cmx
+lib/ocaml/compiler-libs/optmaindriver.mli
lib/ocaml/compiler-libs/outcometree.cmi
lib/ocaml/compiler-libs/outcometree.cmti
lib/ocaml/compiler-libs/outcometree.mli
@@ -973,11 +991,21 @@ lib/ocaml/compiler-libs/path.cmt
lib/ocaml/compiler-libs/path.cmti
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/path.cmx
lib/ocaml/compiler-libs/path.mli
+lib/ocaml/compiler-libs/patterns.cmi
+lib/ocaml/compiler-libs/patterns.cmt
+lib/ocaml/compiler-libs/patterns.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/patterns.cmx
+lib/ocaml/compiler-libs/patterns.mli
lib/ocaml/compiler-libs/persistent_env.cmi
lib/ocaml/compiler-libs/persistent_env.cmt
lib/ocaml/compiler-libs/persistent_env.cmti
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/persistent_env.cmx
lib/ocaml/compiler-libs/persistent_env.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/polling.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/polling.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/polling.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/polling.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/polling.mli
lib/ocaml/compiler-libs/pparse.cmi
lib/ocaml/compiler-libs/pparse.cmt
lib/ocaml/compiler-libs/pparse.cmti
@@ -1083,16 +1111,6 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-lib
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg.cmti
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg_availability_set.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg_availability_set.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg_availability_set.cmti
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg_availability_set.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg_availability_set.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg_with_debug_info.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg_with_debug_info.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg_with_debug_info.cmti
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg_with_debug_info.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg_with_debug_info.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reload.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reload.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reload.cmti
@@ -1163,11 +1181,21 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-lib
${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
+lib/ocaml/compiler-libs/shape.cmi
+lib/ocaml/compiler-libs/shape.cmt
+lib/ocaml/compiler-libs/shape.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/shape.cmx
+lib/ocaml/compiler-libs/shape.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
+lib/ocaml/compiler-libs/signature_group.cmi
+lib/ocaml/compiler-libs/signature_group.cmt
+lib/ocaml/compiler-libs/signature_group.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/signature_group.cmx
+lib/ocaml/compiler-libs/signature_group.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
@@ -1196,11 +1224,6 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-lib
${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
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/spacetime_profiling.cmti
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/spacetime_profiling.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/spacetime_profiling.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/spill.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/spill.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/spill.cmti
@@ -1281,24 +1304,47 @@ lib/ocaml/compiler-libs/terminfo.cmt
lib/ocaml/compiler-libs/terminfo.cmti
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/terminfo.cmx
lib/ocaml/compiler-libs/terminfo.mli
+lib/ocaml/compiler-libs/tmc.cmi
+lib/ocaml/compiler-libs/tmc.cmt
+lib/ocaml/compiler-libs/tmc.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/tmc.cmx
+lib/ocaml/compiler-libs/tmc.mli
+lib/ocaml/compiler-libs/topcommon.cmi
+lib/ocaml/compiler-libs/topcommon.cmt
+lib/ocaml/compiler-libs/topcommon.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/topcommon.cmx
+lib/ocaml/compiler-libs/topcommon.mli
lib/ocaml/compiler-libs/topdirs.cmi
lib/ocaml/compiler-libs/topdirs.cmt
lib/ocaml/compiler-libs/topdirs.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/topdirs.cmx
lib/ocaml/compiler-libs/topdirs.mli
+lib/ocaml/compiler-libs/topeval.cmi
+lib/ocaml/compiler-libs/topeval.cmt
+lib/ocaml/compiler-libs/topeval.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/topeval.cmx
+lib/ocaml/compiler-libs/topeval.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/tophooks.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/tophooks.cmx
lib/ocaml/compiler-libs/toploop.cmi
lib/ocaml/compiler-libs/toploop.cmt
lib/ocaml/compiler-libs/toploop.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/toploop.cmx
lib/ocaml/compiler-libs/toploop.mli
lib/ocaml/compiler-libs/topmain.cmi
lib/ocaml/compiler-libs/topmain.cmt
lib/ocaml/compiler-libs/topmain.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/topmain.cmx
lib/ocaml/compiler-libs/topmain.mli
lib/ocaml/compiler-libs/topstart.cmi
lib/ocaml/compiler-libs/topstart.cmo
lib/ocaml/compiler-libs/topstart.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/topstart.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/topstart.o
lib/ocaml/compiler-libs/trace.cmi
lib/ocaml/compiler-libs/trace.cmt
lib/ocaml/compiler-libs/trace.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/trace.cmx
lib/ocaml/compiler-libs/trace.mli
lib/ocaml/compiler-libs/translattribute.cmi
lib/ocaml/compiler-libs/translattribute.cmt
@@ -1472,22 +1518,23 @@ lib/ocaml/complex.ml
lib/ocaml/complex.mli
lib/ocaml/digest.ml
lib/ocaml/digest.mli
-${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/ocaml/dynlink.a
+${PLIST.ocaml-opt}lib/ocaml/dynlink.a
lib/ocaml/dynlink.cma
lib/ocaml/dynlink.cmi
lib/ocaml/dynlink.cmti
-${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/ocaml/dynlink.cmx
-${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/ocaml/dynlink.cmxa
+${PLIST.ocaml-opt}lib/ocaml/dynlink.cmx
+${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_compilerlibs.cmx
-${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/ocaml/dynlink_platform_intf.cmx
-${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/ocaml/dynlink_types.cmx
+${PLIST.ocaml-opt}lib/ocaml/dynlink_common.cmx
+${PLIST.ocaml-opt}lib/ocaml/dynlink_compilerlibs.cmx
+${PLIST.ocaml-opt}lib/ocaml/dynlink_platform_intf.cmx
+${PLIST.ocaml-opt}lib/ocaml/dynlink_types.cmx
+lib/ocaml/either.ml
+lib/ocaml/either.mli
lib/ocaml/ephemeron.ml
lib/ocaml/ephemeron.mli
lib/ocaml/eventlog_metadata
lib/ocaml/expunge
-lib/ocaml/extract_crc
lib/ocaml/filename.ml
lib/ocaml/filename.mli
lib/ocaml/float.ml
@@ -1502,6 +1549,8 @@ lib/ocaml/genlex.ml
lib/ocaml/genlex.mli
lib/ocaml/hashtbl.ml
lib/ocaml/hashtbl.mli
+lib/ocaml/in_channel.ml
+lib/ocaml/in_channel.mli
lib/ocaml/int.ml
lib/ocaml/int.mli
lib/ocaml/int32.ml
@@ -1517,15 +1566,13 @@ ${PLIST.ocaml-opt}lib/ocaml/libasmrun.a
${PLIST.ocaml-opt}lib/ocaml/libasmrun_pic.a
${PLIST.ocaml-opt}lib/ocaml/libasmrun_shared.so
${PLIST.ocaml-opt}lib/ocaml/libasmrund.a
-${PLIST.instrumented_runtime}${PLIST.ocaml-opt}lib/ocaml/libasmruni.a
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/libasmrunp.a
+${PLIST.ocaml-opt}lib/ocaml/libasmruni.a
lib/ocaml/libcamlrun.a
lib/ocaml/libcamlrun_pic.a
lib/ocaml/libcamlrun_shared.so
lib/ocaml/libcamlrund.a
-${PLIST.instrumented_runtime}lib/ocaml/libcamlruni.a
+lib/ocaml/libcamlruni.a
lib/ocaml/libcamlstr.a
-${PLIST.ocaml-spacetime}${PLIST.ocaml-opt}lib/ocaml/libraw_spacetime_lib.a
lib/ocaml/libthreads.a
${PLIST.ocaml-opt}lib/ocaml/libthreadsnat.a
lib/ocaml/libunix.a
@@ -1543,7 +1590,6 @@ lib/ocaml/nativeint.ml
lib/ocaml/nativeint.mli
lib/ocaml/obj.ml
lib/ocaml/obj.mli
-lib/ocaml/objinfo_helper
lib/ocaml/ocamldoc/ocamldoc.hva
lib/ocaml/ocamldoc/odoc.cmi
${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc.cmx
@@ -1650,6 +1696,8 @@ lib/ocaml/oo.ml
lib/ocaml/oo.mli
lib/ocaml/option.ml
lib/ocaml/option.mli
+lib/ocaml/out_channel.ml
+lib/ocaml/out_channel.mli
lib/ocaml/parsing.ml
lib/ocaml/parsing.mli
lib/ocaml/pervasives.ml
@@ -1667,14 +1715,6 @@ lib/ocaml/queue.ml
lib/ocaml/queue.mli
lib/ocaml/random.ml
lib/ocaml/random.mli
-${PLIST.ocaml-spacetime}${PLIST.ocaml-opt}lib/ocaml/raw_spacetime_lib.a
-${PLIST.ocaml-spacetime}lib/ocaml/raw_spacetime_lib.cma
-${PLIST.ocaml-spacetime}lib/ocaml/raw_spacetime_lib.cmi
-${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-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
@@ -1683,8 +1723,6 @@ lib/ocaml/seq.ml
lib/ocaml/seq.mli
lib/ocaml/set.ml
lib/ocaml/set.mli
-lib/ocaml/spacetime.ml
-lib/ocaml/spacetime.mli
lib/ocaml/stack.ml
lib/ocaml/stack.mli
lib/ocaml/stdLabels.ml
@@ -1695,9 +1733,6 @@ lib/ocaml/std_exit.cmt
${PLIST.ocaml-opt}lib/ocaml/std_exit.cmx
lib/ocaml/std_exit.ml
${PLIST.ocaml-opt}lib/ocaml/std_exit.o
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/std_exit.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/std_exit.p.cmx
-@comment 4.09 ${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
@@ -1707,341 +1742,240 @@ ${PLIST.ocaml-opt}lib/ocaml/stdlib.cmx
${PLIST.ocaml-opt}lib/ocaml/stdlib.cmxa
lib/ocaml/stdlib.ml
lib/ocaml/stdlib.mli
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib.p.a
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib.p.cmx
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib.p.cmxa
-lib/ocaml/stdlib__arg.cmi
-lib/ocaml/stdlib__arg.cmt
-lib/ocaml/stdlib__arg.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__arg.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__arg.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__arg.p.cmx
-lib/ocaml/stdlib__array.cmi
-lib/ocaml/stdlib__array.cmt
-lib/ocaml/stdlib__array.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__array.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__array.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__array.p.cmx
-lib/ocaml/stdlib__arrayLabels.cmi
-lib/ocaml/stdlib__arrayLabels.cmt
-lib/ocaml/stdlib__arrayLabels.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__arrayLabels.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__arrayLabels.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__arrayLabels.p.cmx
-lib/ocaml/stdlib__bigarray.cmi
-lib/ocaml/stdlib__bigarray.cmt
-lib/ocaml/stdlib__bigarray.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__bigarray.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__bigarray.p.cmt
-@comment 4.09 ${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
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__bool.p.cmt
-@comment 4.09 ${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
-${PLIST.ocaml-opt}lib/ocaml/stdlib__buffer.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__buffer.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__buffer.p.cmx
-lib/ocaml/stdlib__bytes.cmi
-lib/ocaml/stdlib__bytes.cmt
-lib/ocaml/stdlib__bytes.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__bytes.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__bytes.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__bytes.p.cmx
-lib/ocaml/stdlib__bytesLabels.cmi
-lib/ocaml/stdlib__bytesLabels.cmt
-lib/ocaml/stdlib__bytesLabels.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__bytesLabels.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__bytesLabels.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__bytesLabels.p.cmx
-lib/ocaml/stdlib__callback.cmi
-lib/ocaml/stdlib__callback.cmt
-lib/ocaml/stdlib__callback.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__callback.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__callback.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__callback.p.cmx
-lib/ocaml/stdlib__char.cmi
-lib/ocaml/stdlib__char.cmt
-lib/ocaml/stdlib__char.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__char.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__char.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__char.p.cmx
-lib/ocaml/stdlib__complex.cmi
-lib/ocaml/stdlib__complex.cmt
-lib/ocaml/stdlib__complex.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__complex.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__complex.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__complex.p.cmx
-lib/ocaml/stdlib__digest.cmi
-lib/ocaml/stdlib__digest.cmt
-lib/ocaml/stdlib__digest.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__digest.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__digest.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__digest.p.cmx
-lib/ocaml/stdlib__ephemeron.cmi
-lib/ocaml/stdlib__ephemeron.cmt
-lib/ocaml/stdlib__ephemeron.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__ephemeron.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__ephemeron.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__ephemeron.p.cmx
-lib/ocaml/stdlib__filename.cmi
-lib/ocaml/stdlib__filename.cmt
-lib/ocaml/stdlib__filename.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__filename.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__filename.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__filename.p.cmx
-lib/ocaml/stdlib__float.cmi
-lib/ocaml/stdlib__float.cmt
-lib/ocaml/stdlib__float.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__float.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__float.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__float.p.cmx
-lib/ocaml/stdlib__format.cmi
-lib/ocaml/stdlib__format.cmt
-lib/ocaml/stdlib__format.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__format.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__format.p.cmt
-@comment 4.09 ${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
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__fun.p.cmt
-@comment 4.09 ${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
-${PLIST.ocaml-opt}lib/ocaml/stdlib__gc.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__gc.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__gc.p.cmx
-lib/ocaml/stdlib__genlex.cmi
-lib/ocaml/stdlib__genlex.cmt
-lib/ocaml/stdlib__genlex.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__genlex.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__genlex.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__genlex.p.cmx
-lib/ocaml/stdlib__hashtbl.cmi
-lib/ocaml/stdlib__hashtbl.cmt
-lib/ocaml/stdlib__hashtbl.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__hashtbl.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__hashtbl.p.cmt
-@comment 4.09 ${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
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__int.p.cmt
-@comment 4.09 ${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
-${PLIST.ocaml-opt}lib/ocaml/stdlib__int32.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__int32.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__int32.p.cmx
-lib/ocaml/stdlib__int64.cmi
-lib/ocaml/stdlib__int64.cmt
-lib/ocaml/stdlib__int64.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__int64.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__int64.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__int64.p.cmx
-lib/ocaml/stdlib__lazy.cmi
-lib/ocaml/stdlib__lazy.cmt
-lib/ocaml/stdlib__lazy.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__lazy.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__lazy.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__lazy.p.cmx
-lib/ocaml/stdlib__lexing.cmi
-lib/ocaml/stdlib__lexing.cmt
-lib/ocaml/stdlib__lexing.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__lexing.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__lexing.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__lexing.p.cmx
-lib/ocaml/stdlib__list.cmi
-lib/ocaml/stdlib__list.cmt
-lib/ocaml/stdlib__list.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__list.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__list.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__list.p.cmx
-lib/ocaml/stdlib__listLabels.cmi
-lib/ocaml/stdlib__listLabels.cmt
-lib/ocaml/stdlib__listLabels.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__listLabels.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__listLabels.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__listLabels.p.cmx
-lib/ocaml/stdlib__map.cmi
-lib/ocaml/stdlib__map.cmt
-lib/ocaml/stdlib__map.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__map.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__map.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__map.p.cmx
-lib/ocaml/stdlib__marshal.cmi
-lib/ocaml/stdlib__marshal.cmt
-lib/ocaml/stdlib__marshal.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__marshal.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__marshal.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__marshal.p.cmx
-lib/ocaml/stdlib__moreLabels.cmi
-lib/ocaml/stdlib__moreLabels.cmt
-lib/ocaml/stdlib__moreLabels.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__moreLabels.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__moreLabels.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__moreLabels.p.cmx
-lib/ocaml/stdlib__nativeint.cmi
-lib/ocaml/stdlib__nativeint.cmt
-lib/ocaml/stdlib__nativeint.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__nativeint.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__nativeint.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__nativeint.p.cmx
-lib/ocaml/stdlib__obj.cmi
-lib/ocaml/stdlib__obj.cmt
-lib/ocaml/stdlib__obj.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__obj.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__obj.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__obj.p.cmx
-lib/ocaml/stdlib__oo.cmi
-lib/ocaml/stdlib__oo.cmt
-lib/ocaml/stdlib__oo.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__oo.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__oo.p.cmt
-@comment 4.09 ${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
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__option.p.cmt
-@comment 4.09 ${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
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__parsing.p.cmt
-@comment 4.09 ${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
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__pervasives.p.cmi
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__pervasives.p.cmt
-@comment 4.09 ${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
-${PLIST.ocaml-opt}lib/ocaml/stdlib__printexc.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__printexc.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__printexc.p.cmx
-lib/ocaml/stdlib__printf.cmi
-lib/ocaml/stdlib__printf.cmt
-lib/ocaml/stdlib__printf.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__printf.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__printf.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__printf.p.cmx
-lib/ocaml/stdlib__queue.cmi
-lib/ocaml/stdlib__queue.cmt
-lib/ocaml/stdlib__queue.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__queue.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__queue.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__queue.p.cmx
-lib/ocaml/stdlib__random.cmi
-lib/ocaml/stdlib__random.cmt
-lib/ocaml/stdlib__random.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__random.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__random.p.cmt
-@comment 4.09 ${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
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__result.p.cmt
-@comment 4.09 ${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
-${PLIST.ocaml-opt}lib/ocaml/stdlib__scanf.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__scanf.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__scanf.p.cmx
-lib/ocaml/stdlib__seq.cmi
-lib/ocaml/stdlib__seq.cmt
-lib/ocaml/stdlib__seq.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__seq.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__seq.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__seq.p.cmx
-lib/ocaml/stdlib__set.cmi
-lib/ocaml/stdlib__set.cmt
-lib/ocaml/stdlib__set.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__set.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__set.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__set.p.cmx
-lib/ocaml/stdlib__spacetime.cmi
-lib/ocaml/stdlib__spacetime.cmt
-lib/ocaml/stdlib__spacetime.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__spacetime.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__spacetime.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__spacetime.p.cmx
-lib/ocaml/stdlib__stack.cmi
-lib/ocaml/stdlib__stack.cmt
-lib/ocaml/stdlib__stack.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__stack.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__stack.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__stack.p.cmx
-lib/ocaml/stdlib__stdLabels.cmi
-lib/ocaml/stdlib__stdLabels.cmt
-lib/ocaml/stdlib__stdLabels.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__stdLabels.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__stdLabels.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__stdLabels.p.cmx
-lib/ocaml/stdlib__stream.cmi
-lib/ocaml/stdlib__stream.cmt
-lib/ocaml/stdlib__stream.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__stream.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__stream.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__stream.p.cmx
-lib/ocaml/stdlib__string.cmi
-lib/ocaml/stdlib__string.cmt
-lib/ocaml/stdlib__string.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__string.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__string.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__string.p.cmx
-lib/ocaml/stdlib__stringLabels.cmi
-lib/ocaml/stdlib__stringLabels.cmt
-lib/ocaml/stdlib__stringLabels.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__stringLabels.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__stringLabels.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__stringLabels.p.cmx
-lib/ocaml/stdlib__sys.cmi
-lib/ocaml/stdlib__sys.cmt
-lib/ocaml/stdlib__sys.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__sys.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__sys.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__sys.p.cmx
-lib/ocaml/stdlib__uchar.cmi
-lib/ocaml/stdlib__uchar.cmt
-lib/ocaml/stdlib__uchar.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__uchar.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__uchar.p.cmt
-@comment 4.09 ${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
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__unit.p.cmt
-@comment 4.09 ${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
-${PLIST.ocaml-opt}lib/ocaml/stdlib__weak.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__weak.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__weak.p.cmx
+lib/ocaml/stdlib__Arg.cmi
+lib/ocaml/stdlib__Arg.cmt
+lib/ocaml/stdlib__Arg.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Arg.cmx
+lib/ocaml/stdlib__Array.cmi
+lib/ocaml/stdlib__Array.cmt
+lib/ocaml/stdlib__Array.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Array.cmx
+lib/ocaml/stdlib__ArrayLabels.cmi
+lib/ocaml/stdlib__ArrayLabels.cmt
+lib/ocaml/stdlib__ArrayLabels.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__ArrayLabels.cmx
+lib/ocaml/stdlib__Atomic.cmi
+lib/ocaml/stdlib__Atomic.cmt
+lib/ocaml/stdlib__Atomic.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Atomic.cmx
+lib/ocaml/stdlib__Bigarray.cmi
+lib/ocaml/stdlib__Bigarray.cmt
+lib/ocaml/stdlib__Bigarray.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Bigarray.cmx
+lib/ocaml/stdlib__Bool.cmi
+lib/ocaml/stdlib__Bool.cmt
+lib/ocaml/stdlib__Bool.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Bool.cmx
+lib/ocaml/stdlib__Buffer.cmi
+lib/ocaml/stdlib__Buffer.cmt
+lib/ocaml/stdlib__Buffer.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Buffer.cmx
+lib/ocaml/stdlib__Bytes.cmi
+lib/ocaml/stdlib__Bytes.cmt
+lib/ocaml/stdlib__Bytes.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Bytes.cmx
+lib/ocaml/stdlib__BytesLabels.cmi
+lib/ocaml/stdlib__BytesLabels.cmt
+lib/ocaml/stdlib__BytesLabels.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__BytesLabels.cmx
+lib/ocaml/stdlib__Callback.cmi
+lib/ocaml/stdlib__Callback.cmt
+lib/ocaml/stdlib__Callback.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Callback.cmx
+lib/ocaml/stdlib__Char.cmi
+lib/ocaml/stdlib__Char.cmt
+lib/ocaml/stdlib__Char.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Char.cmx
+lib/ocaml/stdlib__Complex.cmi
+lib/ocaml/stdlib__Complex.cmt
+lib/ocaml/stdlib__Complex.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Complex.cmx
+lib/ocaml/stdlib__Digest.cmi
+lib/ocaml/stdlib__Digest.cmt
+lib/ocaml/stdlib__Digest.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Digest.cmx
+lib/ocaml/stdlib__Either.cmi
+lib/ocaml/stdlib__Either.cmt
+lib/ocaml/stdlib__Either.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Either.cmx
+lib/ocaml/stdlib__Ephemeron.cmi
+lib/ocaml/stdlib__Ephemeron.cmt
+lib/ocaml/stdlib__Ephemeron.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Ephemeron.cmx
+lib/ocaml/stdlib__Filename.cmi
+lib/ocaml/stdlib__Filename.cmt
+lib/ocaml/stdlib__Filename.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Filename.cmx
+lib/ocaml/stdlib__Float.cmi
+lib/ocaml/stdlib__Float.cmt
+lib/ocaml/stdlib__Float.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Float.cmx
+lib/ocaml/stdlib__Format.cmi
+lib/ocaml/stdlib__Format.cmt
+lib/ocaml/stdlib__Format.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Format.cmx
+lib/ocaml/stdlib__Fun.cmi
+lib/ocaml/stdlib__Fun.cmt
+lib/ocaml/stdlib__Fun.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Fun.cmx
+lib/ocaml/stdlib__Gc.cmi
+lib/ocaml/stdlib__Gc.cmt
+lib/ocaml/stdlib__Gc.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Gc.cmx
+lib/ocaml/stdlib__Genlex.cmi
+lib/ocaml/stdlib__Genlex.cmt
+lib/ocaml/stdlib__Genlex.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Genlex.cmx
+lib/ocaml/stdlib__Hashtbl.cmi
+lib/ocaml/stdlib__Hashtbl.cmt
+lib/ocaml/stdlib__Hashtbl.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Hashtbl.cmx
+lib/ocaml/stdlib__In_channel.cmi
+lib/ocaml/stdlib__In_channel.cmt
+lib/ocaml/stdlib__In_channel.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__In_channel.cmx
+lib/ocaml/stdlib__Int.cmi
+lib/ocaml/stdlib__Int.cmt
+lib/ocaml/stdlib__Int.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Int.cmx
+lib/ocaml/stdlib__Int32.cmi
+lib/ocaml/stdlib__Int32.cmt
+lib/ocaml/stdlib__Int32.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Int32.cmx
+lib/ocaml/stdlib__Int64.cmi
+lib/ocaml/stdlib__Int64.cmt
+lib/ocaml/stdlib__Int64.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Int64.cmx
+lib/ocaml/stdlib__Lazy.cmi
+lib/ocaml/stdlib__Lazy.cmt
+lib/ocaml/stdlib__Lazy.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Lazy.cmx
+lib/ocaml/stdlib__Lexing.cmi
+lib/ocaml/stdlib__Lexing.cmt
+lib/ocaml/stdlib__Lexing.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Lexing.cmx
+lib/ocaml/stdlib__List.cmi
+lib/ocaml/stdlib__List.cmt
+lib/ocaml/stdlib__List.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__List.cmx
+lib/ocaml/stdlib__ListLabels.cmi
+lib/ocaml/stdlib__ListLabels.cmt
+lib/ocaml/stdlib__ListLabels.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__ListLabels.cmx
+lib/ocaml/stdlib__Map.cmi
+lib/ocaml/stdlib__Map.cmt
+lib/ocaml/stdlib__Map.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Map.cmx
+lib/ocaml/stdlib__Marshal.cmi
+lib/ocaml/stdlib__Marshal.cmt
+lib/ocaml/stdlib__Marshal.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Marshal.cmx
+lib/ocaml/stdlib__MoreLabels.cmi
+lib/ocaml/stdlib__MoreLabels.cmt
+lib/ocaml/stdlib__MoreLabels.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__MoreLabels.cmx
+lib/ocaml/stdlib__Nativeint.cmi
+lib/ocaml/stdlib__Nativeint.cmt
+lib/ocaml/stdlib__Nativeint.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Nativeint.cmx
+lib/ocaml/stdlib__Obj.cmi
+lib/ocaml/stdlib__Obj.cmt
+lib/ocaml/stdlib__Obj.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Obj.cmx
+lib/ocaml/stdlib__Oo.cmi
+lib/ocaml/stdlib__Oo.cmt
+lib/ocaml/stdlib__Oo.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Oo.cmx
+lib/ocaml/stdlib__Option.cmi
+lib/ocaml/stdlib__Option.cmt
+lib/ocaml/stdlib__Option.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Option.cmx
+lib/ocaml/stdlib__Out_channel.cmi
+lib/ocaml/stdlib__Out_channel.cmt
+lib/ocaml/stdlib__Out_channel.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Out_channel.cmx
+lib/ocaml/stdlib__Parsing.cmi
+lib/ocaml/stdlib__Parsing.cmt
+lib/ocaml/stdlib__Parsing.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Parsing.cmx
+lib/ocaml/stdlib__Pervasives.cmi
+lib/ocaml/stdlib__Pervasives.cmt
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Pervasives.cmx
+lib/ocaml/stdlib__Printexc.cmi
+lib/ocaml/stdlib__Printexc.cmt
+lib/ocaml/stdlib__Printexc.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Printexc.cmx
+lib/ocaml/stdlib__Printf.cmi
+lib/ocaml/stdlib__Printf.cmt
+lib/ocaml/stdlib__Printf.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Printf.cmx
+lib/ocaml/stdlib__Queue.cmi
+lib/ocaml/stdlib__Queue.cmt
+lib/ocaml/stdlib__Queue.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Queue.cmx
+lib/ocaml/stdlib__Random.cmi
+lib/ocaml/stdlib__Random.cmt
+lib/ocaml/stdlib__Random.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Random.cmx
+lib/ocaml/stdlib__Result.cmi
+lib/ocaml/stdlib__Result.cmt
+lib/ocaml/stdlib__Result.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Result.cmx
+lib/ocaml/stdlib__Scanf.cmi
+lib/ocaml/stdlib__Scanf.cmt
+lib/ocaml/stdlib__Scanf.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Scanf.cmx
+lib/ocaml/stdlib__Seq.cmi
+lib/ocaml/stdlib__Seq.cmt
+lib/ocaml/stdlib__Seq.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Seq.cmx
+lib/ocaml/stdlib__Set.cmi
+lib/ocaml/stdlib__Set.cmt
+lib/ocaml/stdlib__Set.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Set.cmx
+lib/ocaml/stdlib__Stack.cmi
+lib/ocaml/stdlib__Stack.cmt
+lib/ocaml/stdlib__Stack.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Stack.cmx
+lib/ocaml/stdlib__StdLabels.cmi
+lib/ocaml/stdlib__StdLabels.cmt
+lib/ocaml/stdlib__StdLabels.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__StdLabels.cmx
+lib/ocaml/stdlib__Stream.cmi
+lib/ocaml/stdlib__Stream.cmt
+lib/ocaml/stdlib__Stream.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Stream.cmx
+lib/ocaml/stdlib__String.cmi
+lib/ocaml/stdlib__String.cmt
+lib/ocaml/stdlib__String.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__String.cmx
+lib/ocaml/stdlib__StringLabels.cmi
+lib/ocaml/stdlib__StringLabels.cmt
+lib/ocaml/stdlib__StringLabels.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__StringLabels.cmx
+lib/ocaml/stdlib__Sys.cmi
+lib/ocaml/stdlib__Sys.cmt
+lib/ocaml/stdlib__Sys.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Sys.cmx
+lib/ocaml/stdlib__Uchar.cmi
+lib/ocaml/stdlib__Uchar.cmt
+lib/ocaml/stdlib__Uchar.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Uchar.cmx
+lib/ocaml/stdlib__Unit.cmi
+lib/ocaml/stdlib__Unit.cmt
+lib/ocaml/stdlib__Unit.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Unit.cmx
+lib/ocaml/stdlib__Weak.cmi
+lib/ocaml/stdlib__Weak.cmt
+lib/ocaml/stdlib__Weak.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Weak.cmx
${PLIST.ocaml-opt}lib/ocaml/str.a
lib/ocaml/str.cma
lib/ocaml/str.cmi
lib/ocaml/str.cmti
${PLIST.ocaml-opt}lib/ocaml/str.cmx
${PLIST.ocaml-opt}lib/ocaml/str.cmxa
-${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/ocaml/str.cmxs
+${PLIST.ocaml-opt}lib/ocaml/str.cmxs
lib/ocaml/str.mli
lib/ocaml/stream.ml
lib/ocaml/stream.mli
@@ -2050,10 +1984,8 @@ lib/ocaml/string.mli
lib/ocaml/stringLabels.ml
lib/ocaml/stringLabels.mli
lib/ocaml/stublibs/dllcamlstr.so
-${PLIST.ocaml-spacetime}lib/ocaml/stublibs/dllraw_spacetime_lib.so
lib/ocaml/stublibs/dllthreads.so
lib/ocaml/stublibs/dllunix.so
-@comment 4.09 lib/ocaml/stublibs/dllvmthreads.so
lib/ocaml/sys.ml
lib/ocaml/sys.mli
lib/ocaml/threads/condition.cmi
@@ -2068,6 +2000,10 @@ 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/semaphore.cmi
+lib/ocaml/threads/semaphore.cmti
+${PLIST.ocaml-opt}lib/ocaml/threads/semaphore.cmx
+lib/ocaml/threads/semaphore.mli
lib/ocaml/threads/thread.cmi
lib/ocaml/threads/thread.cmti
${PLIST.ocaml-opt}lib/ocaml/threads/thread.cmx
@@ -2093,7 +2029,7 @@ lib/ocaml/unix.cmi
lib/ocaml/unix.cmti
${PLIST.ocaml-opt}lib/ocaml/unix.cmx
${PLIST.ocaml-opt}lib/ocaml/unix.cmxa
-${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/ocaml/unix.cmxs
+${PLIST.ocaml-opt}lib/ocaml/unix.cmxs
lib/ocaml/unix.mli
lib/ocaml/unixLabels.cmi
lib/ocaml/unixLabels.cmti
@@ -2154,6 +2090,7 @@ man/man3/Ast_invariants.3
man/man3/Ast_iterator.3
man/man3/Ast_mapper.3
man/man3/Asttypes.3
+man/man3/Atomic.3
man/man3/Attr_helper.3
man/man3/Bigarray.3
man/man3/Bigarray.Array0.3
@@ -2161,6 +2098,7 @@ man/man3/Bigarray.Array1.3
man/man3/Bigarray.Array2.3
man/man3/Bigarray.Array3.3
man/man3/Bigarray.Genarray.3
+man/man3/Binutils.3
man/man3/Bool.3
man/man3/Buffer.3
man/man3/Build_path_prefix_map.3
@@ -2168,6 +2106,7 @@ man/man3/Builtin_attributes.3
man/man3/Bytes.3
man/man3/BytesLabels.3
man/man3/Callback.3
+man/man3/CamlinternalAtomic.3
man/man3/CamlinternalFormat.3
man/man3/CamlinternalFormatBasics.3
man/man3/CamlinternalLazy.3
@@ -2195,6 +2134,7 @@ man/man3/CamlinternalMenhirLib.Inspectio
man/man3/CamlinternalMenhirLib.InspectionTableInterpreter.3
man/man3/CamlinternalMenhirLib.InspectionTableInterpreter.Make.3
man/man3/CamlinternalMenhirLib.InspectionTableInterpreter.Symbols.3
+man/man3/CamlinternalMenhirLib.LexerUtil.3
man/man3/CamlinternalMenhirLib.LinearizedArray.3
man/man3/CamlinternalMenhirLib.PackedIntArray.3
man/man3/CamlinternalMenhirLib.Printers.3
@@ -2221,21 +2161,37 @@ man/man3/Consistbl.3
man/man3/Consistbl.Make.3
man/man3/Depend.3
man/man3/Depend.String.3
+man/man3/Diffing.3
+man/man3/Diffing.Define.3
+man/man3/Diffing.Define.Left_variadic.3
+man/man3/Diffing.Define.Parameters.3
+man/man3/Diffing.Define.Right_variadic.3
+man/man3/Diffing.Define.S.3
+man/man3/Diffing.Define.Simple.3
+man/man3/Diffing.Defs.3
+man/man3/Diffing_with_keys.3
+man/man3/Diffing_with_keys.Define.3
+man/man3/Diffing_with_keys.Define.Parameters.3
+man/man3/Diffing_with_keys.Define.Simple.3
man/man3/Digest.3
man/man3/Docstrings.3
man/man3/Docstrings.WithMenhir.3
man/man3/Domainstate.3
man/man3/Dynlink.3
+man/man3/Either.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.Bucket.3
man/man3/Ephemeron.K1.Make.3
man/man3/Ephemeron.K1.MakeSeeded.3
man/man3/Ephemeron.K2.3
+man/man3/Ephemeron.K2.Bucket.3
man/man3/Ephemeron.K2.Make.3
man/man3/Ephemeron.K2.MakeSeeded.3
man/man3/Ephemeron.Kn.3
+man/man3/Ephemeron.Kn.Bucket.3
man/man3/Ephemeron.Kn.Make.3
man/man3/Ephemeron.Kn.MakeSeeded.3
man/man3/Ephemeron.S.3
@@ -2246,6 +2202,7 @@ man/man3/Float.3
man/man3/Float.Array.3
man/man3/Float.ArrayLabels.3
man/man3/Format.3
+man/man3/Format_tutorial.3
man/man3/Fun.3
man/man3/Gc.3
man/man3/Gc.Memprof.3
@@ -2272,17 +2229,20 @@ man/man3/Identifiable.Set.T.3
man/man3/Identifiable.Tbl.3
man/man3/Identifiable.Tbl.T.3
man/man3/Identifiable.Thing.3
+man/man3/In_channel.3
man/man3/Int.3
man/man3/Int32.3
man/man3/Int64.3
man/man3/Int_replace_polymorphic_compare.3
man/man3/Lazy.3
+man/man3/Lazy_backtrack.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/Local_store.3
man/man3/Location.3
man/man3/Longident.3
man/man3/Map.3
@@ -2292,7 +2252,6 @@ man/man3/Map.S.3
man/man3/Marshal.3
man/man3/Misc.3
man/man3/Misc.Color.3
-man/man3/Misc.EnvLazy.3
man/man3/Misc.Error_style.3
man/man3/Misc.Int_literal_converter.3
man/man3/Misc.LongString.3
@@ -2329,11 +2288,13 @@ man/man3/Numbers.Int.3
man/man3/Numbers.Int16.3
man/man3/Numbers.Int8.3
man/man3/Obj.3
+man/man3/Obj.Closure.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/Out_channel.3
man/man3/Parse.3
man/man3/Parser.3
man/man3/Parser.Incremental.3
@@ -2353,14 +2314,14 @@ man/man3/Random.State.3
man/man3/Result.3
man/man3/Scanf.3
man/man3/Scanf.Scanning.3
+man/man3/Semaphore.3
+man/man3/Semaphore.Binary.3
+man/man3/Semaphore.Counting.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/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
@@ -2371,6 +2332,7 @@ man/man3/Stdlib.3
man/man3/Stdlib.Arg.3
man/man3/Stdlib.Array.3
man/man3/Stdlib.ArrayLabels.3
+man/man3/Stdlib.Atomic.3
man/man3/Stdlib.Bigarray.3
man/man3/Stdlib.Bool.3
man/man3/Stdlib.Buffer.3
@@ -2380,6 +2342,7 @@ man/man3/Stdlib.Callback.3
man/man3/Stdlib.Char.3
man/man3/Stdlib.Complex.3
man/man3/Stdlib.Digest.3
+man/man3/Stdlib.Either.3
man/man3/Stdlib.Ephemeron.3
man/man3/Stdlib.Filename.3
man/man3/Stdlib.Float.3
@@ -2388,6 +2351,7 @@ man/man3/Stdlib.Fun.3
man/man3/Stdlib.Gc.3
man/man3/Stdlib.Genlex.3
man/man3/Stdlib.Hashtbl.3
+man/man3/Stdlib.In_channel.3
man/man3/Stdlib.Int.3
man/man3/Stdlib.Int32.3
man/man3/Stdlib.Int64.3
@@ -2403,6 +2367,7 @@ man/man3/Stdlib.Nativeint.3
man/man3/Stdlib.Obj.3
man/man3/Stdlib.Oo.3
man/man3/Stdlib.Option.3
+man/man3/Stdlib.Out_channel.3
man/man3/Stdlib.Parsing.3
man/man3/Stdlib.Pervasives.3
man/man3/Stdlib.Printexc.3
@@ -2413,7 +2378,6 @@ 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
@@ -2451,3 +2415,7 @@ man/man3/Warnings.3
man/man3/Weak.3
man/man3/Weak.Make.3
man/man3/Weak.S.3
+share/doc/ocaml/Changes
+share/doc/ocaml/LICENSE
+share/doc/ocaml/README.adoc
+share/doc/ocaml/README.win32.adoc
Index: pkgsrc/lang/ocaml/buildlink3.mk
diff -u pkgsrc/lang/ocaml/buildlink3.mk:1.56 pkgsrc/lang/ocaml/buildlink3.mk:1.57
--- pkgsrc/lang/ocaml/buildlink3.mk:1.56 Mon Mar 8 08:08:43 2021
+++ pkgsrc/lang/ocaml/buildlink3.mk Tue May 24 18:25:38 2022
@@ -1,12 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.56 2021/03/08 08:08:43 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.57 2022/05/24 18:25:38 jaapb Exp $
+# Should only be used through ocaml.mk, not directly.
BUILDLINK_TREE+= ocaml
.if !defined(OCAML_BUILDLINK3_MK)
OCAML_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.ocaml+= ocaml>=4.11.2
-BUILDLINK_ABI_DEPENDS.ocaml+= ocaml>=4.11.2
+BUILDLINK_API_DEPENDS.ocaml+= ocaml>=4.14.0
+BUILDLINK_ABI_DEPENDS.ocaml+= ocaml>=4.14.0
BUILDLINK_PKGSRCDIR.ocaml?= ../../lang/ocaml
#BUILDLINK_DEPMETHOD.ocaml?= build
Index: pkgsrc/lang/ocaml/distinfo
diff -u pkgsrc/lang/ocaml/distinfo:1.144 pkgsrc/lang/ocaml/distinfo:1.145
--- pkgsrc/lang/ocaml/distinfo:1.144 Tue Oct 26 10:51:45 2021
+++ pkgsrc/lang/ocaml/distinfo Tue May 24 18:25:38 2022
@@ -1,22 +1,25 @@
-$NetBSD: distinfo,v 1.144 2021/10/26 10:51:45 nia Exp $
+$NetBSD: distinfo,v 1.145 2022/05/24 18:25:38 jaapb Exp $
-BLAKE2s (ocaml-4.11.2.tar.gz) = 09a9cb064f5f1c0de850572e6fdaeaf48cacb95e79f3bdc50beda74ee74030e2
-SHA512 (ocaml-4.11.2.tar.gz) = 5697c8fe6a7d2b1a0199e60e397f766161d31edf146c4d9020dc08592c1ffb0e4cfaccaccfa3feb36bf31dceb10e23c566d6c4d53f0ecfa823abeef81235338e
-Size (ocaml-4.11.2.tar.gz) = 4969981 bytes
-SHA1 (patch-Makefile) = bd0451b5240b087c98747d13f9884d30722a91a8
-SHA1 (patch-Makefile.common.in) = 37d880f7125040fd4a125ff0e24615811ce9c827
+BLAKE2s (ocaml-4.14.0.tar.gz) = 07f8e81765693d73c5b9326da424df67c9281a5e04fc6ca0f2539935fdc96d2c
+SHA512 (ocaml-4.14.0.tar.gz) = 84cd7fd96a4cde5f1063caae112629f37812add4ca2a888c56b3992b8d5528769c2ebc6b1b8f4a0b54e620f8450a7dbe11225f716e0f47cef0d3707457911ac0
+Size (ocaml-4.14.0.tar.gz) = 5492464 bytes
+SHA1 (patch-Makefile) = 978156d1e5795615adda840521bf5911a801f6a5
+SHA1 (patch-Makefile.build_config.in) = 9702fc3b8fa8f4e963f3e4a193439a12836af816
+SHA1 (patch-api__docgen_ocamldoc_Makefile) = cc677bed9d2da3d7eedd2c696ac89085bf2002d2
SHA1 (patch-check-linker-version_sh) = c90242556207242ac58499d7f42519a10aedcca4
-SHA1 (patch-configure) = 5791eba70a6d06fe79f6268a3d4e40a1dc636fd1
-SHA1 (patch-lex_Makefile) = 7f1ad4d5852a9a38b9c33ca33728236cc457fa09
-SHA1 (patch-man_Makefile) = b780c026aef5f7e6b22b142fce3ec87ef9d2ab22
-SHA1 (patch-ocamldoc_Makefile) = 0a3c536d1cd9f811a1ef1d7155036b8ddbcf4f4f
+SHA1 (patch-configure) = 36ddb6f19ce7564889dc48ee290904dce00b04ec
+SHA1 (patch-lex_Makefile) = ba5df45c608fa292732e1acd0d955870e60c972d
+SHA1 (patch-man_Makefile) = 3d55fe5127758566f81a1b4e55e66c6ae3a848f1
+SHA1 (patch-ocamldoc_Makefile) = 5431d357ecbe719efffeb14826a8d79f0590784e
SHA1 (patch-ocamldoc_odoc__messages.ml) = 77f650a5f34f40b9648a8d5091e9aa31efb5734b
-SHA1 (patch-otherlibs_Makefile.otherlibs.common) = 05f14ad2635bfd2ded98ef38ac6e7578b5cfc08e
-SHA1 (patch-otherlibs_systhreads_Makefile) = ff2cf90527bda37474097bb576bccbf7329c4f1d
+SHA1 (patch-otherlibs_Makefile.otherlibs.common) = 5518c6b4d8772d995252b6f640323e2602097c4d
+SHA1 (patch-otherlibs_systhreads_Makefile) = 76b6619f43562d30be9a87fd450b75033f4aff0b
SHA1 (patch-otherlibs_systhreads_st__stubs.c) = 3c0aa73f0e128646c01ed3855ee9c5645d5fa3f1
-SHA1 (patch-otherlibs_unix_Makefile) = 84f236dab98d684e70fe92294779e65ce3f11e7f
-SHA1 (patch-runtime_Makefile) = 6c70b68791e4c074179aa27dfafb398646b59dcb
+SHA1 (patch-otherlibs_unix_Makefile) = 9eaf8d561670a765a647b36486ec533c674ee609
+SHA1 (patch-runtime_Makefile) = 4daf1ddb9ce70d99719bcb0aacbaadfc393574b0
+SHA1 (patch-runtime_floats.c) = 584a30d31c7b7da4f8387dc58b90fa1a8078f723
+SHA1 (patch-runtime_sak.c) = 62a0946419b96033497a4a12105bbd9b4ef3aba6
SHA1 (patch-testsuite_tests_lib-systhreads_testyield.ml) = 0f6d35e030de168c6f4aeb126055065ed47878aa
-SHA1 (patch-tools_Makefile) = 69f92a8615ed6f9b33f27546c6a25a1f24995e55
-SHA1 (patch-tools_ocamlmklib.ml) = 9a9c0e3b473f7ba4127fe120cf6dbbdbb3c957f2
-SHA1 (patch-yacc_Makefile) = 3d8962a2d447aa7e88e59151d66e2080f7fad1fb
+SHA1 (patch-tools_Makefile) = f71ac6fa7f2ee79c6d531f95eb90d28360c04434
+SHA1 (patch-tools_ocamlmklib.ml) = 66ddab3ae0f6890326a51d315a2516fe4975107d
+SHA1 (patch-yacc_Makefile) = ee27db9ca0149ee9e1dc93988458bbb7446ecb89
Index: pkgsrc/lang/ocaml/options.mk
diff -u pkgsrc/lang/ocaml/options.mk:1.5 pkgsrc/lang/ocaml/options.mk:1.6
--- pkgsrc/lang/ocaml/options.mk:1.5 Wed Dec 9 10:33:04 2020
+++ pkgsrc/lang/ocaml/options.mk Tue May 24 18:25:38 2022
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.5 2020/12/09 10:33:04 jaapb Exp $
+# $NetBSD: options.mk,v 1.6 2022/05/24 18:25:38 jaapb Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.ocaml
-PKG_SUPPORTED_OPTIONS= pic flambda spacetime
+PKG_SUPPORTED_OPTIONS= pic flambda
PKG_SUGGESTED_OPTIONS= pic
.include "../../mk/bsd.prefs.mk"
@@ -18,9 +18,3 @@ CONFIGURE_ARGS+= --enable-flambda
.else
CONFIGURE_ARGS+= --disable-flambda
.endif
-
-.if !empty(PKG_OPTIONS:Mspacetime)
-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.16 pkgsrc/lang/ocaml/patches/patch-Makefile:1.17
--- pkgsrc/lang/ocaml/patches/patch-Makefile:1.16 Wed Dec 9 10:33:04 2020
+++ pkgsrc/lang/ocaml/patches/patch-Makefile Tue May 24 18:25:38 2022
@@ -1,20 +1,20 @@
-$NetBSD: patch-Makefile,v 1.16 2020/12/09 10:33:04 jaapb Exp $
+$NetBSD: patch-Makefile,v 1.17 2022/05/24 18:25:38 jaapb Exp $
Use BSD_INSTALL_* instead of mkdir
Honor LDFLAGS
---- Makefile.orig 2020-09-01 12:47:58.000000000 +0000
+--- Makefile.orig 2022-02-08 16:50:12.000000000 +0000
+++ Makefile
-@@ -61,7 +61,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 \
+@@ -50,7 +50,7 @@ COMPFLAGS=-strict-sequence -principal -a
+ -w +a-4-9-40-41-42-44-45-48-66-70 \
+ -warn-error +a \
-bin-annot -safe-string -strict-formats $(INCLUDES)
-LINKFLAGS=
+LINKFLAGS= -cclib "$(LDFLAGS)"
ifeq "$(strip $(NATDYNLINKOPTS))" ""
OCAML_NATDYNLINKOPTS=
-@@ -351,10 +351,10 @@ endif
+@@ -377,11 +377,11 @@ DOC_FILES=\
# Installation
.PHONY: install
install:
@@ -22,19 +22,30 @@ Honor LDFLAGS
- $(MKDIR) "$(INSTALL_LIBDIR)"
- $(MKDIR) "$(INSTALL_STUBLIBDIR)"
- $(MKDIR) "$(INSTALL_COMPLIBDIR)"
+- $(MKDIR) "$(INSTALL_DOCDIR)"
+ $(BSD_INSTALL_PROGRAM_DIR) "$(INSTALL_BINDIR)"
+ $(BSD_INSTALL_LIB_DIR) "$(INSTALL_LIBDIR)"
+ $(BSD_INSTALL_LIB_DIR) "$(INSTALL_STUBLIBDIR)"
+ $(BSD_INSTALL_LIB_DIR) "$(INSTALL_COMPLIBDIR)"
- $(INSTALL_DATA) \
- VERSION \
- "$(INSTALL_LIBDIR)"
-@@ -408,7 +408,7 @@ ifeq "$(INSTALL_SOURCE_ARTIFACTS)" "true
++ $(BSD_INSTALL_DATA_DIR) "$(INSTALL_DOCDIR)"
+ $(MAKE) -C runtime install
+ $(INSTALL_PROG) ocaml$(EXE) "$(INSTALL_BINDIR)"
+ ifeq "$(INSTALL_BYTECODE_PROGRAMS)" "true"
+@@ -462,7 +462,7 @@ ifeq "$(INSTALL_BYTECODE_PROGRAMS)" "tru
+ $(INSTALL_PROG) \
+ boot/flexlink.byte$(EXE) "$(INSTALL_BINDIR)/flexlink.byte$(EXE)"
+ endif # ifeq "$(INSTALL_BYTECODE_PROGRAMS)" "true"
+- $(MKDIR) "$(INSTALL_FLEXDLLDIR)"
++ $(BSD_INSTALL_LIB_DIR) "$(INSTALL_FLEXDLLDIR)"
+ $(INSTALL_DATA) $(addprefix stdlib/flexdll/, $(FLEXDLL_OBJECTS)) \
+ "$(INSTALL_FLEXDLLDIR)"
+ endif # ifeq "$(BOOTSTRAPPING_FLEXDLL)" "true"
+@@ -792,7 +792,7 @@ runtime: $(addprefix stdlib/flexdll/, $(
+ stdlib/flexdll/flexdll%.$(O): $(FLEXDLL_SOURCES)/flexdll%.$(O) | stdlib/flexdll
+ cp $< $@
+ stdlib/flexdll:
+- $(MKDIR) $@
++ $(BSD_INSTALL_LIB_DIR) $@
endif
- $(MAKE) -C tools install
- ifeq "$(UNIX_OR_WIN32)" "unix" # Install manual pages only on Unix
-- $(MKDIR) "$(INSTALL_MANDIR)/man$(PROGRAMS_MAN_SECTION)"
-+ $(BSD_INSTALL_MAN_DIR) "$(INSTALL_MANDIR)/man$(PROGRAMS_MAN_SECTION)"
- -$(MAKE) -C man install
- endif
- for i in $(OTHERLIBRARIES); do \
+
+ .PHONY: makeruntime
Index: pkgsrc/lang/ocaml/patches/patch-configure
diff -u pkgsrc/lang/ocaml/patches/patch-configure:1.43 pkgsrc/lang/ocaml/patches/patch-configure:1.44
--- pkgsrc/lang/ocaml/patches/patch-configure:1.43 Wed Dec 9 10:33:04 2020
+++ pkgsrc/lang/ocaml/patches/patch-configure Tue May 24 18:25:38 2022
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.43 2020/12/09 10:33:04 jaapb Exp $
+$NetBSD: patch-configure,v 1.44 2022/05/24 18:25:38 jaapb Exp $
All kinds of OS-specific changes to configure
Honor LDFLAGS.
@@ -7,9 +7,9 @@ Add SunOS -lnsl -lsocket
Recognise SunOS/amd64 as amd64
Recognise SunOS as having shared libraries
---- configure.orig 2020-09-01 12:47:58.000000000 +0000
+--- configure.orig 2022-02-21 15:57:25.000000000 +0000
+++ configure
-@@ -13476,7 +13476,7 @@ sharedlib_cflags=''
+@@ -14081,7 +14081,7 @@ sharedlib_cflags=''
mksharedlib='shared-libs-not-available'
rpath=''
mksharedlibrpath=''
@@ -18,20 +18,7 @@ Recognise SunOS as having shared librari
if test x"$enable_shared" != "xno"; then :
case $host in #(
-@@ -13513,6 +13513,12 @@ esac ;; #(
- mksharedlibrpath="-Wl,-rpath,"
- natdynlinkopts="-Wl,-E"
- shared_libraries_supported=true ;; #(
-+ *-*-solaris*)
-+ sharedlib_cflags="-fPIC"
-+ mksharedlib="$CC -shared"
-+ rpath="-Wl,-rpath,"
-+ mksharedlibrpath="-Wl,rpath,"
-+ shared_libraries_supported=true ;;
- *) :
- ;;
- esac
-@@ -13534,6 +13540,8 @@ if test x"$enable_shared" != "xno"; then
+@@ -14157,6 +14157,8 @@ if test x"$supports_shared_libraries" =
natdynlink=true ;; #(
*-pc-windows) :
natdynlink=true ;; #(
@@ -40,7 +27,7 @@ Recognise SunOS as having shared librari
i[3456]86-*-linux*) :
natdynlink=true ;; #(
i[3456]86-*-gnu*) :
-@@ -13562,6 +13570,8 @@ if test x"$enable_shared" != "xno"; then
+@@ -14191,6 +14193,8 @@ if test x"$supports_shared_libraries" =
natdynlink=true ;; #(
i[3456]86-*-netbsd*) :
natdynlink=true ;; #(
@@ -49,7 +36,7 @@ Recognise SunOS as having shared librari
x86_64-*-netbsd*) :
natdynlink=true ;; #(
i386-*-gnu0.3) :
-@@ -13572,12 +13582,16 @@ if test x"$enable_shared" != "xno"; then
+@@ -14201,12 +14205,16 @@ if test x"$supports_shared_libraries" =
natdynlink=true ;; #(
arm*-*-freebsd*) :
natdynlink=true ;; #(
@@ -63,10 +50,10 @@ Recognise SunOS as having shared librari
natdynlink=true ;; #(
+ aarch64-*-netbsd*) :
+ natdynlink=true ;; #(
- riscv*-*-linux*) :
+ aarch64-*-openbsd*) :
natdynlink=true ;; #(
- *) :
-@@ -13649,6 +13663,8 @@ case $host in #(
+ riscv*-*-linux*) :
+@@ -14315,6 +14323,8 @@ case $host in #(
arch=i386; system=beos ;; #(
i[3456]86-*-cygwin) :
arch=i386; system=cygwin ;; #(
@@ -75,7 +62,7 @@ Recognise SunOS as having shared librari
i[3456]86-*-gnu*) :
arch=i386; system=gnu ;; #(
i[3456]86-*-mingw32) :
-@@ -13665,6 +13681,8 @@ case $host in #(
+@@ -14331,6 +14341,8 @@ case $host in #(
else
model=ppc
fi; system=elf ;; #(
@@ -83,8 +70,8 @@ Recognise SunOS as having shared librari
+ arch=power; model=ppc; system=netbsd ;; #(
s390x*-*-linux*) :
arch=s390x; model=z10; system=elf ;; #(
- armv6*-*-linux-gnueabihf) :
-@@ -13683,6 +13701,10 @@ fi; system=elf ;; #(
+ # expected to match "gnueabihf" as well as "musleabihf"
+@@ -14350,6 +14362,10 @@ fi; system=elf ;; #(
arch=arm; model=armv6; system=linux_eabi ;; #(
armv6*-*-freebsd*) :
arch=arm; model=armv6; system=freebsd ;; #(
@@ -95,54 +82,102 @@ Recognise SunOS as having shared librari
earmv6*-*-netbsd*) :
arch=arm; model=armv6; system=netbsd ;; #(
earmv7*-*-netbsd*) :
-@@ -13719,8 +13741,12 @@ fi; system=elf ;; #(
+@@ -14394,10 +14410,14 @@ fi; system=elf ;; #(
arch=arm64; system=linux ;; #(
aarch64-*-freebsd*) :
arch=arm64; system=freebsd ;; #(
+ aarch64-*-netbsd*) :
+ arch=arm64; system=netbsd ;; #(
+ aarch64-*-openbsd*) :
+ arch=arm64; system=openbsd ;; #(
x86_64-*-cygwin*) :
arch=amd64; system=cygwin ;; #(
+ x86_64-*-solaris*) :
-+ arch=amd64; system=solaris ;; #(
++ arch=arm64; system=solaris ;; #(
riscv64-*-linux*) :
arch=riscv; model=riscv64; system=linux
;; #(
-@@ -13851,8 +13877,6 @@ if test -z "$PARTIALLD"; then :
- case "$arch,$CC,$system,$model" in #(
- amd64,gcc*,macosx,*) :
- PACKLD='ld -r -arch x86_64 -o $(EMPTY)' ;; #(
-- amd64,gcc*,solaris,*) :
-- PACKLD='ld -r -m elf_x86_64 -o $(EMPTY)' ;; #(
- power,gcc*,elf,ppc) :
- PACKLD='ld -r -m elf32ppclinux -o $(EMPTY)' ;; #(
- power,gcc*,elf,ppc64) :
-@@ -13947,6 +13971,9 @@ esac ;; #(
+@@ -14613,6 +14633,9 @@ case $as_target,$ocaml_cv_cc_vendor in #
*) :
;;
esac ;; #(
+ power,netbsd):
+ default_as="${toolpref}as -mppc"
-+ default_aspp="${toolpref}gcc -c" ;; #(
- s390x,elf) :
- default_as="${toolpref}as -m 64 -march=$model"
- default_aspp="${toolpref}gcc -c -Wa,-march=$model" ;; #(
-@@ -14028,7 +14055,7 @@ fi
- # for the moment, to be backward-compatible
++ default_aspp="${toolpref}gcc -c " ;; #(
+ i686-pc-windows,*) :
+ default_as="ml -nologo -coff -Cp -c -Fo"
+ default_aspp="$default_as" ;; #(
+@@ -15223,6 +15246,64 @@ if test "x$ac_cv_func_socketpair" = xyes
- case $host in #(
-- *-*-mingw32|*-pc-windows) :
-+ *-*-mingw32|*-pc-windows|*-*-netbsd*) :
- ;; #(
- *) :
- has_c99_float_ops=true
-@@ -14317,6 +14344,9 @@ case $host in #(
- *-*-mingw32|*-pc-windows) :
- cclibs="$cclibs -lws2_32"
- sockets=true ;; #(
+ fi
+ ;; #(
+ *-*-solaris*) :
+ cclibs="$cclibs -lnsl -lsocket"
-+ sockets=true ;; #(
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5
++$as_echo_n "checking for library containing socket... " >&6; }
++if ${ac_cv_search_socket+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ ac_func_search_save_LIBS=$LIBS
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
++#ifdef __cplusplus
++extern "C"
++#endif
++char socket ();
++int
++main ()
++{
++return socket ();
++ ;
++ return 0;
++}
++_ACEOF
++for ac_lib in '' ws2_32; do
++ if test -z "$ac_lib"; then
++ ac_res="none required"
++ else
++ ac_res=-l$ac_lib
++ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
++ fi
++ if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_search_socket=$ac_res
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext
++ if ${ac_cv_search_socket+:} false; then :
++ break
++fi
++done
++if ${ac_cv_search_socket+:} false; then :
++
++else
++ ac_cv_search_socket=no
++fi
++rm conftest.$ac_ext
++LIBS=$ac_func_search_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5
++$as_echo "$ac_cv_search_socket" >&6; }
++ac_res=$ac_cv_search_socket
++if test "$ac_res" != no; then :
++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
++
++fi
++ ;; #(
*-*-haiku) :
cclibs="$cclibs -lnetwork"
- sockets=true ;; #(
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5
+@@ -17374,7 +17455,7 @@ as_has_debug_prefix_map=false
+ asm_cfi_supported=false
+ if $native_compiler; then :
+ case $host in #(
+- *-*-mingw32|*-pc-windows) :
++ *-*-mingw32|*-pc-windows|*-*-netbsd*) :
+ ;; #(
+ *) :
+
Index: pkgsrc/lang/ocaml/patches/patch-lex_Makefile
diff -u pkgsrc/lang/ocaml/patches/patch-lex_Makefile:1.3 pkgsrc/lang/ocaml/patches/patch-lex_Makefile:1.4
--- pkgsrc/lang/ocaml/patches/patch-lex_Makefile:1.3 Wed Dec 9 10:33:04 2020
+++ pkgsrc/lang/ocaml/patches/patch-lex_Makefile Tue May 24 18:25:38 2022
@@ -1,24 +1,24 @@
-$NetBSD: patch-lex_Makefile,v 1.3 2020/12/09 10:33:04 jaapb Exp $
+$NetBSD: patch-lex_Makefile,v 1.4 2022/05/24 18:25:38 jaapb Exp $
Honor LDFLAGS.
---- lex/Makefile.orig 2020-01-10 16:10:46.000000000 +0000
+--- lex/Makefile.orig 2021-09-30 15:40:11.000000000 +0000
+++ lex/Makefile
-@@ -27,7 +27,7 @@ CAMLC = $(BOOT_OCAMLC) -strict-sequence
- CAMLOPT = $(CAMLRUN) $(ROOTDIR)/ocamlopt -nostdlib -I $(ROOTDIR)/stdlib
- COMPFLAGS = -absname -w +a-4-9-41-42-44-45-48 -warn-error A \
+@@ -31,7 +31,7 @@ CAMLC = $(BOOT_OCAMLC) -strict-sequence
+ CAMLOPT = $(OCAMLRUN) $(ROOTDIR)/ocamlopt$(EXE) -nostdlib -I $(ROOTDIR)/stdlib
+ COMPFLAGS = -absname -w +a-4-9-41-42-44-45-48-70 -warn-error +A \
-safe-string -strict-sequence -strict-formats -bin-annot
-LINKFLAGS =
+LINKFLAGS = -cclib "$(LDFLAGS)"
- YACCFLAGS = -v
- CAMLLEX = $(CAMLRUN) $(ROOTDIR)/boot/ocamllex
CAMLDEP = $(BOOT_OCAMLC) -depend
-@@ -46,7 +46,7 @@ ocamllex: $(OBJS)
- $(CAMLC) $(LINKFLAGS) -compat-32 -o ocamllex $(OBJS)
+ DEPFLAGS = -slash
+ DEPINCLUDES =
+@@ -52,7 +52,7 @@ ocamllex$(EXE): $(OBJS)
+ $(CAMLC) $(LINKFLAGS) -compat-32 -o $@ $^
- ocamllex.opt: $(OBJS:.cmo=.cmx)
-- $(CAMLOPT_CMD) -o ocamllex.opt $(OBJS:.cmo=.cmx)
-+ $(CAMLOPT_CMD) $(LINKFLAGS) -o ocamllex.opt $(OBJS:.cmo=.cmx)
+ ocamllex.opt$(EXE): $(OBJS:.cmo=.cmx)
+- $(CAMLOPT_CMD) -o $@ $^
++ $(CAMLOPT_CMD) $(LINKFLAGS) -o $@ $^
clean::
- rm -f ocamllex ocamllex.opt
+ rm -f $(programs) $(programs:=.exe)
Index: pkgsrc/lang/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common
diff -u pkgsrc/lang/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common:1.3 pkgsrc/lang/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common:1.4
--- pkgsrc/lang/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common:1.3 Wed Dec 9 10:33:04 2020
+++ pkgsrc/lang/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common Tue May 24 18:25:38 2022
@@ -1,11 +1,11 @@
-$NetBSD: patch-otherlibs_Makefile.otherlibs.common,v 1.3 2020/12/09 10:33:04 jaapb Exp $
+$NetBSD: patch-otherlibs_Makefile.otherlibs.common,v 1.4 2022/05/24 18:25:38 jaapb Exp $
Honor LDFLAGS.
---- otherlibs/Makefile.otherlibs.common.orig 2020-01-10 16:10:46.000000000 +0000
+--- otherlibs/Makefile.otherlibs.common.orig 2021-02-24 13:49:29.000000000 +0000
+++ otherlibs/Makefile.otherlibs.common
-@@ -51,7 +51,7 @@ COBJS ?=
- EXTRACFLAGS ?=
+@@ -50,7 +50,7 @@ EXTRACFLAGS ?=
+ EXTRACPPFLAGS ?=
EXTRACAMLFLAGS ?=
LINKOPTS ?=
-LDOPTS ?=
Index: pkgsrc/lang/ocaml/patches/patch-otherlibs_unix_Makefile
diff -u pkgsrc/lang/ocaml/patches/patch-otherlibs_unix_Makefile:1.3 pkgsrc/lang/ocaml/patches/patch-otherlibs_unix_Makefile:1.4
--- pkgsrc/lang/ocaml/patches/patch-otherlibs_unix_Makefile:1.3 Fri Jan 8 12:28:16 2021
+++ pkgsrc/lang/ocaml/patches/patch-otherlibs_unix_Makefile Tue May 24 18:25:38 2022
@@ -1,15 +1,15 @@
-$NetBSD: patch-otherlibs_unix_Makefile,v 1.3 2021/01/08 12:28:16 jperkin Exp $
+$NetBSD: patch-otherlibs_unix_Makefile,v 1.4 2022/05/24 18:25:38 jaapb Exp $
-Honor LDFLAGS to fix RELRO build.
+Honor LDFLAGS.
---- otherlibs/unix/Makefile.orig 2020-09-01 12:47:58.000000000 +0000
+--- otherlibs/unix/Makefile.orig 2021-02-24 13:49:29.000000000 +0000
+++ otherlibs/unix/Makefile
-@@ -20,7 +20,7 @@ LIBNAME=unix
- EXTRACAMLFLAGS=-nolabels
+@@ -23,7 +23,7 @@ unixLabels.cmi: \
+ EXTRACAMLFLAGS += -pp "$(AWK) -f $(ROOTDIR)/stdlib/expand_module_aliases.awk"
# dllunix.so particularly requires libm for modf symbols
-LDOPTS=$(NATIVECCLIBS)
-+LDOPTS=$(NATIVECCLIBS) -ldopt "$(LDFLAGS)"
++LDOPTS=$(NATIVECCLIBS) "$(LDFLAGS)"
COBJS=accept.o access.o addrofstr.o alarm.o bind.o channels.o chdir.o \
chmod.o chown.o chroot.o close.o fsync.o closedir.o connect.o cst2constr.o \
Index: pkgsrc/lang/ocaml/patches/patch-runtime_Makefile
diff -u pkgsrc/lang/ocaml/patches/patch-runtime_Makefile:1.3 pkgsrc/lang/ocaml/patches/patch-runtime_Makefile:1.4
--- pkgsrc/lang/ocaml/patches/patch-runtime_Makefile:1.3 Wed Dec 9 10:33:04 2020
+++ pkgsrc/lang/ocaml/patches/patch-runtime_Makefile Tue May 24 18:25:38 2022
@@ -1,24 +1,19 @@
-$NetBSD: patch-runtime_Makefile,v 1.3 2020/12/09 10:33:04 jaapb Exp $
+$NetBSD: patch-runtime_Makefile,v 1.4 2022/05/24 18:25:38 jaapb Exp $
Honor LDFLAGS.
---- runtime/Makefile.orig 2019-04-18 10:10:54.000000000 +0000
+--- runtime/Makefile.orig 2021-09-30 15:40:11.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
+@@ -265,7 +265,7 @@ build_config.h: $(ROOTDIR)/Makefile.conf
+ # Libraries and programs
- # Build, install and clean targets
-@@ -292,13 +292,13 @@ libcamlrun.$(A): $(libcamlrun_OBJECTS)
+ ocamlrun$(EXE): prims.$(O) libcamlrun.$(A)
+- $(MKEXE) -o $@ $^ $(LIBS)
++ $(MKEXE) $(LDFLAGS) -o $@ $^ $(LIBS)
+
+ ocamlruns$(EXE): prims.$(O) libcamlrun_non_shared.$(A)
+ $(call MKEXE_USING_COMPILER,$@,$^ $(LIBS))
+@@ -277,13 +277,13 @@ libcamlrun_non_shared.$(A): $(libcamlrun
$(call MKLIB,$@, $^)
ocamlrund$(EXE): prims.$(O) libcamlrund.$(A)
@@ -29,12 +24,12 @@ Honor LDFLAGS.
$(call MKLIB,$@, $^)
ocamlruni$(EXE): prims.$(O) libcamlruni.$(A)
-- $(MKEXE) -o $@ $^ $(LIBS)
-+ $(MKEXE) $(LDFLAGS) -o $@ $^ $(LIBS)
+- $(MKEXE) -o $@ $^ $(INSTRUMENTED_RUNTIME_LIBS) $(LIBS)
++ $(MKEXE) $(LDFLAGS) -o $@ $^ $(INSTRUMENTED_RUNTIME_LIBS) $(LIBS)
libcamlruni.$(A): $(libcamlruni_OBJECTS)
$(call MKLIB,$@, $^)
-@@ -307,7 +307,7 @@ libcamlrun_pic.$(A): $(libcamlrunpic_OBJ
+@@ -292,7 +292,7 @@ libcamlrun_pic.$(A): $(libcamlrunpic_OBJ
$(call MKLIB,$@, $^)
libcamlrun_shared.$(SO): $(libcamlrunpic_OBJECTS)
@@ -43,7 +38,7 @@ Honor LDFLAGS.
libasmrun.$(A): $(libasmrun_OBJECTS)
$(call MKLIB,$@, $^)
-@@ -325,7 +325,7 @@ libasmrun_pic.$(A): $(libasmrunpic_OBJEC
+@@ -307,7 +307,7 @@ libasmrun_pic.$(A): $(libasmrunpic_OBJEC
$(call MKLIB,$@, $^)
libasmrun_shared.$(SO): $(libasmrunpic_OBJECTS)
Index: pkgsrc/lang/ocaml/patches/patch-tools_Makefile
diff -u pkgsrc/lang/ocaml/patches/patch-tools_Makefile:1.3 pkgsrc/lang/ocaml/patches/patch-tools_Makefile:1.4
--- pkgsrc/lang/ocaml/patches/patch-tools_Makefile:1.3 Wed Dec 9 10:33:04 2020
+++ pkgsrc/lang/ocaml/patches/patch-tools_Makefile Tue May 24 18:25:38 2022
@@ -1,15 +1,15 @@
-$NetBSD: patch-tools_Makefile,v 1.3 2020/12/09 10:33:04 jaapb Exp $
+$NetBSD: patch-tools_Makefile,v 1.4 2022/05/24 18:25:38 jaapb Exp $
Honor LDFLAGS.
---- tools/Makefile.orig 2020-01-10 16:10:46.000000000 +0000
+--- tools/Makefile.orig 2021-09-30 15:40:11.000000000 +0000
+++ tools/Makefile
-@@ -82,7 +82,7 @@ INCLUDES = $(addprefix -I $(ROOTDIR)/,ut
+@@ -41,7 +41,7 @@ INCLUDES = $(addprefix -I $(ROOTDIR)/,ut
file_formats lambda)
- COMPFLAGS = -absname -w +a-4-9-41-42-44-45-48 -strict-sequence -warn-error A \
- -principal -safe-string -strict-formats -bin-annot $(INCLUDES)
+ COMPFLAGS = -absname -w +a-4-9-41-42-44-45-48-70 -strict-sequence \
+ -warn-error +A -principal -safe-string -strict-formats -bin-annot $(INCLUDES)
-LINKFLAGS = $(INCLUDES)
+LINKFLAGS = $(INCLUDES) -cclib "$(LDFLAGS)"
VPATH := $(filter-out -I,$(INCLUDES))
- .PHONY: all allopt opt.opt # allopt and opt.opt are synonyms
+ programs_byte := \
Index: pkgsrc/lang/ocaml/patches/patch-man_Makefile
diff -u pkgsrc/lang/ocaml/patches/patch-man_Makefile:1.4 pkgsrc/lang/ocaml/patches/patch-man_Makefile:1.5
--- pkgsrc/lang/ocaml/patches/patch-man_Makefile:1.4 Wed Jan 10 14:30:35 2018
+++ pkgsrc/lang/ocaml/patches/patch-man_Makefile Tue May 24 18:25:38 2022
@@ -1,15 +1,14 @@
-$NetBSD: patch-man_Makefile,v 1.4 2018/01/10 14:30:35 jaapb Exp $
+$NetBSD: patch-man_Makefile,v 1.5 2022/05/24 18:25:38 jaapb Exp $
Use BSD_INSTALL_* instead of mkdir and cp
---- man/Makefile.orig 2017-10-03 08:35:24.000000000 +0000
+--- man/Makefile.orig 2022-02-08 16:50:12.000000000 +0000
+++ man/Makefile
-@@ -18,7 +18,7 @@ include ../config/Makefile
- INSTALL_DIR=$(DESTDIR)$(MANDIR)/man$(PROGRAMS_MAN_SECTION)
+@@ -22,5 +22,5 @@ MANPAGES = $(addsuffix .1,\
+ .PHONY: install
install:
-- for i in *.m; do cp \
-+ for i in *.m; do $(BSD_INSTALL_MAN) \
- $$i $(INSTALL_DIR)/`basename $$i .m`.$(PROGRAMS_MAN_SECTION); done
- echo '.so man$(PROGRAMS_MAN_SECTION)/ocamlc.$(PROGRAMS_MAN_SECTION)' \
- > $(INSTALL_DIR)/ocamlc.opt.$(PROGRAMS_MAN_SECTION)
+- $(MKDIR) $(INSTALL_PROGRAMS_MAN_DIR)
+- $(INSTALL_DATA) $(MANPAGES) $(INSTALL_PROGRAMS_MAN_DIR)
++ $(BSD_INSTALL_MAN_DIR) $(INSTALL_PROGRAMS_MAN_DIR)
++ $(BSD_INSTALL_MAN) $(MANPAGES) $(INSTALL_PROGRAMS_MAN_DIR)
Index: pkgsrc/lang/ocaml/patches/patch-ocamldoc_Makefile
diff -u pkgsrc/lang/ocaml/patches/patch-ocamldoc_Makefile:1.9 pkgsrc/lang/ocaml/patches/patch-ocamldoc_Makefile:1.10
--- pkgsrc/lang/ocaml/patches/patch-ocamldoc_Makefile:1.9 Wed Dec 9 10:33:04 2020
+++ pkgsrc/lang/ocaml/patches/patch-ocamldoc_Makefile Tue May 24 18:25:38 2022
@@ -1,11 +1,11 @@
-$NetBSD: patch-ocamldoc_Makefile,v 1.9 2020/12/09 10:33:04 jaapb Exp $
+$NetBSD: patch-ocamldoc_Makefile,v 1.10 2022/05/24 18:25:38 jaapb Exp $
Honor LDFLAGS.
---- ocamldoc/Makefile.orig 2020-01-10 16:10:46.000000000 +0000
+--- ocamldoc/Makefile.orig 2021-09-30 15:40:11.000000000 +0000
+++ ocamldoc/Makefile
-@@ -121,7 +121,7 @@ INCLUDES=$(INCLUDES_DEP) $(INCLUDES_NODE
- COMPFLAGS=$(INCLUDES) -absname -w +a-4-9-41-42-44-45-48 -warn-error A \
+@@ -77,7 +77,7 @@ INCLUDES=$(INCLUDES_DEP) $(INCLUDES_NODE
+ COMPFLAGS=$(INCLUDES) -absname -w +a-4-9-41-42-44-45-48-70 -warn-error +A \
-safe-string -strict-sequence -strict-formats -bin-annot -principal
-LINKFLAGS=$(INCLUDES) -nostdlib
Index: pkgsrc/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile
diff -u pkgsrc/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile:1.12 pkgsrc/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile:1.13
--- pkgsrc/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile:1.12 Wed Dec 9 10:33:04 2020
+++ pkgsrc/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile Tue May 24 18:25:38 2022
@@ -1,36 +1,37 @@
-$NetBSD: patch-otherlibs_systhreads_Makefile,v 1.12 2020/12/09 10:33:04 jaapb Exp $
+$NetBSD: patch-otherlibs_systhreads_Makefile,v 1.13 2022/05/24 18:25:38 jaapb Exp $
+Use BSD_INSTALL_* instead of mkdir
Honor LDFLAGS.
---- otherlibs/systhreads/Makefile.orig 2020-01-10 16:10:46.000000000 +0000
+--- otherlibs/systhreads/Makefile.orig 2021-09-30 15:40:11.000000000 +0000
+++ otherlibs/systhreads/Makefile
-@@ -29,6 +29,7 @@ NATIVE_CPPFLAGS = \
- CAMLRUN ?= $(ROOTDIR)/boot/ocamlrun
+@@ -30,6 +30,7 @@ NATIVE_CPPFLAGS = \
+ -DNATIVE_CODE -DTARGET_$(ARCH) -DMODEL_$(MODEL) -DSYS_$(SYSTEM)
LIBS = -nostdlib -I $(ROOTDIR)/stdlib -I $(ROOTDIR)/otherlibs/$(UNIXLIB)
+LDOPTS = -ldopt "$(LDFLAGS)"
CAMLC=$(BEST_OCAMLC) $(LIBS)
CAMLOPT=$(BEST_OCAMLOPT) $(LIBS)
-@@ -70,7 +71,7 @@ all: lib$(LIBNAME).$(A) $(LIBNAME).cma $
+@@ -66,7 +67,7 @@ all: lib$(LIBNAME).$(A) $(LIBNAME).cma $
allopt: lib$(LIBNAME)nat.$(A) $(LIBNAME).cmxa $(CMIFILES)
lib$(LIBNAME).$(A): $(BYTECODE_C_OBJS)
-- $(MKLIB_CMD) -o $(LIBNAME) $(BYTECODE_C_OBJS) $(PTHREAD_LINK)
-+ $(MKLIB_CMD) -o $(LIBNAME) $(BYTECODE_C_OBJS) $(PTHREAD_LINK) $(LDOPTS)
+- $(MKLIB_CMD) -o $(LIBNAME) $(BYTECODE_C_OBJS) $(PTHREAD_LIBS)
++ $(MKLIB_CMD) -o $(LIBNAME) $(BYTECODE_C_OBJS) $(PTHREAD_LIBS) $(LDOPTS)
lib$(LIBNAME)nat.$(A): $(NATIVECODE_C_OBJS)
$(MKLIB_CMD) -o $(LIBNAME)nat $^
-@@ -78,7 +79,7 @@ lib$(LIBNAME)nat.$(A): $(NATIVECODE_C_OB
+@@ -74,7 +75,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) $^
-+ $(PTHREAD_CAML_LINK) $(LDOPTS) $^
+- $(PTHREAD_CAML_LIBS) $^
++ $(PTHREAD_CAML_LIBS) $(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
-@@ -124,7 +125,7 @@ install:
+@@ -122,7 +123,7 @@ install:
fi
$(INSTALL_DATA) libthreads.$(A) "$(INSTALL_LIBDIR)"
cd "$(INSTALL_LIBDIR)"; $(RANLIB) libthreads.$(A)
Index: pkgsrc/lang/ocaml/patches/patch-tools_ocamlmklib.ml
diff -u pkgsrc/lang/ocaml/patches/patch-tools_ocamlmklib.ml:1.1 pkgsrc/lang/ocaml/patches/patch-tools_ocamlmklib.ml:1.2
--- pkgsrc/lang/ocaml/patches/patch-tools_ocamlmklib.ml:1.1 Wed Dec 9 10:33:04 2020
+++ pkgsrc/lang/ocaml/patches/patch-tools_ocamlmklib.ml Tue May 24 18:25:38 2022
@@ -1,18 +1,18 @@
-$NetBSD: patch-tools_ocamlmklib.ml,v 1.1 2020/12/09 10:33:04 jaapb Exp $
+$NetBSD: patch-tools_ocamlmklib.ml,v 1.2 2022/05/24 18:25:38 jaapb Exp $
Add ELF mode support to ocamlmklib
---- tools/ocamlmklib.ml.orig 2019-02-08 14:34:11.000000000 +0000
+--- tools/ocamlmklib.ml.orig 2021-09-30 15:40:11.000000000 +0000
+++ tools/ocamlmklib.ml
-@@ -43,6 +43,7 @@ and c_objs = ref [] (* .o, .a, .
+@@ -42,6 +42,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
+ and dynlink = ref Config.supports_shared_libraries
+and elfmode = ref false (* do not add C link lib path to run-time path *)
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 *)
-@@ -110,6 +111,8 @@ let parse_arguments argv =
+@@ -109,6 +110,8 @@ let parse_arguments argv =
c_objs := s :: !c_objs
else if s = "-cclib" then
caml_libs := next_arg s :: "-cclib" :: !caml_libs
@@ -21,7 +21,7 @@ Add ELF mode support to ocamlmklib
else if s = "-ccopt" then
caml_opts := next_arg s :: "-ccopt" :: !caml_opts
else if s = "-custom" then
-@@ -136,8 +139,9 @@ let parse_arguments argv =
+@@ -135,8 +138,9 @@ let parse_arguments argv =
c_libs := s :: !c_libs
else if starts_with s "-L" then
(c_Lopts := s :: !c_Lopts;
@@ -33,7 +33,7 @@ Add ELF mode support to ocamlmklib
else if s = "-ocamlcflags" then
ocamlc_opts := next_arg s :: !ocamlc_opts
else if s = "-ocamlc" then
-@@ -152,6 +156,8 @@ let parse_arguments argv =
+@@ -151,6 +155,8 @@ let parse_arguments argv =
output_c := next_arg s
else if s = "-dllpath" || s = "-R" || s = "-rpath" then
rpath := next_arg s :: !rpath
@@ -42,7 +42,7 @@ Add ELF mode support to ocamlmklib
else if starts_with s "-R" then
rpath := chop_prefix s "-R" :: !rpath
else if s = "-Wl,-rpath" then
-@@ -200,6 +206,7 @@ Usage: ocamlmklib [options] <.cmo|.cma|.
+@@ -199,6 +205,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\
Index: pkgsrc/lang/ocaml/patches/patch-yacc_Makefile
diff -u pkgsrc/lang/ocaml/patches/patch-yacc_Makefile:1.6 pkgsrc/lang/ocaml/patches/patch-yacc_Makefile:1.7
--- pkgsrc/lang/ocaml/patches/patch-yacc_Makefile:1.6 Wed Dec 9 10:33:04 2020
+++ pkgsrc/lang/ocaml/patches/patch-yacc_Makefile Tue May 24 18:25:38 2022
@@ -1,15 +1,15 @@
-$NetBSD: patch-yacc_Makefile,v 1.6 2020/12/09 10:33:04 jaapb Exp $
+$NetBSD: patch-yacc_Makefile,v 1.7 2022/05/24 18:25:38 jaapb Exp $
Honor LDFLAGS when building ocamlyacc.
---- yacc/Makefile.orig 2020-01-10 16:10:46.000000000 +0000
+--- yacc/Makefile.orig 2022-02-08 16:50:13.000000000 +0000
+++ yacc/Makefile
-@@ -39,7 +39,7 @@ generated_files := ocamlyacc$(EXE) $(oca
+@@ -38,7 +38,7 @@ generated_files := ocamlyacc$(EXE) $(oca
all: ocamlyacc$(EXE)
ocamlyacc$(EXE): $(ocamlyacc_OBJECTS)
- $(MKEXE) -o $@ $^ $(EXTRALIBS)
+ $(MKEXE) $(BYTECCLIBS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS)
- version.h : $(ROOTDIR)/VERSION
- echo "#define OCAML_VERSION \"`sed -e 1q $< | tr -d '\r'`\"" > $@
+ .PHONY: clean
+ clean:
Added files:
Index: pkgsrc/lang/ocaml/native.mk
diff -u /dev/null pkgsrc/lang/ocaml/native.mk:1.1
--- /dev/null Tue May 24 18:25:38 2022
+++ pkgsrc/lang/ocaml/native.mk Tue May 24 18:25:38 2022
@@ -0,0 +1,47 @@
+# $NetBSD: native.mk,v 1.1 2022/05/24 18:25:38 jaapb Exp $
+#
+# This Makefile fragment handles the native code compiler options for OCaml.
+# It is used by ocaml.mk and the lang/ocaml package.
+#
+# Build def variables:
+# OCAML_USE_OPT_COMPILER
+# if set to yes, will enable optimised (native code) compilation
+# default value: depends on architecture
+#
+# PLIST variable:
+# PLIST.ocaml-opt for files only installed when using the optimised compiler
+# Set based on OCAML_USE_OPT_COMPILER
+
+.if !defined(OCAML_NATIVE_MK)
+OCAML_NATIVE_MK= # defined
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+BUILD_DEFS+= OCAML_USE_OPT_COMPILER
+
+_VARGROUPS+= ocaml
+_DEF_VARS.ocaml= \
+ OCAML_USE_OPT_COMPILER
+
+# Default value of OCAML_USE_OPT_COMPILER
+.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
+ !empty(MACHINE_ARCH:M*arm*) || (${MACHINE_ARCH} == "aarch64") || \
+ (${MACHINE_ARCH} == "aarch64eb") || (${MACHINE_ARCH} == "x86_64")
+OCAML_USE_OPT_COMPILER?= yes
+.else
+OCAML_USE_OPT_COMPILER?= no
+.endif
+
+# Things that get installed with the opt compiler
+PLIST_VARS+= ocaml-opt
+
+.if ${OCAML_USE_OPT_COMPILER} == "yes"
+# The opt compiler needs the C compiler suite
+USE_LANGUAGES+= c
+PLIST.ocaml-opt= yes
+.else
+# If we're bytecode compiling, don't strip executables
+INSTALL_UNSTRIPPED= yes
+.endif
+
+.endif # OCAML_NATIVE_MK
Index: pkgsrc/lang/ocaml/ocaml.mk
diff -u /dev/null pkgsrc/lang/ocaml/ocaml.mk:1.1
--- /dev/null Tue May 24 18:25:38 2022
+++ pkgsrc/lang/ocaml/ocaml.mk Tue May 24 18:25:38 2022
@@ -0,0 +1,253 @@
+# $NetBSD: ocaml.mk,v 1.1 2022/05/24 18:25:38 jaapb Exp $
+#
+# This Makefile fragment handles the common variables used by OCaml packages.
+# It should be included by every package that uses OCaml.
+#
+# Package-settable variables:
+# OCAML_USE_FINDLIB
+# package uses findlib infrastructure
+# OCAML_FINDLIB_DIRS
+# directories under OCAML_SITELIBDIR that this package installs into
+# OCAML_FINDLIB_REGISTER
+# register findlib directories into OCaml ld.conf
+# OCAML_USE_OASIS [implies OCAML_USE_FINDLIB]
+# package uses oasis infrastructure
+# OCAML_USE_OASIS_DYNRUN [implies OCAML_USE_OASIS]
+# package uses oasis.dynrun
+# OCAML_USE_OPAM
+# package uses OPAM installer [implies OCAML_USE_FINDLIB]
+# OCAML_USE_TOPKG
+# package uses topkg [implies OCAML_USE_FINDLIB]
+# OCAML_USE_DUNE
+# package uses dune [implies OCAML_USE_OPAM]
+# OCAML_TOPKG_DOCDIR
+# different targets for topkg (bytecode, optional bytecode, native)
+# OASIS_BUILD_ARGS
+# arguments for oasis build
+# Set by this file:
+# OCAML_SITELIBDIR
+
+.if !defined(OCAML_MK)
+OCAML_MK= # defined
+
+# Text relocations errors when building packages that use
+# ocamlfind on i386.
+MKPIE_SUPPORTED= no
+
+.include "../../mk/bsd.fast.prefs.mk"
+.include "../../lang/ocaml/native.mk"
+
+
+_PKG_VARS.ocaml= \
+ OCAML_USE_FINDLIB \
+ OCAML_FINDLIB_DIRS \
+ OCAML_FINDLIB_REGISTER \
+ OCAML_USE_OASIS \
+ OCAML_USE_OASIS_DYNRUN \
+ OASIS_BUILD_ARGS \
+ OCAML_USE_OPAM \
+ OCAML_USE_TOPKG \
+ OCAML_TOPKG_NAME \
+ OCAML_TOPKG_DOCDIR \
+ OCAML_TOPKG_FLAGS \
+ OCAML_TOPKG_TARGETS \
+ OCAML_TOPKG_OPTIONAL_TARGETS \
+ OCAML_USE_DUNE \
+ DUNE_BUILD_FLAGS \
+ DUNE_BUILD_PACKAGES \
+ DUNE_BUILD_TARGETS \
+ OCAML_BUILD_ARGS \
+ OPAM_INSTALL_DIR \
+ OPAM_INSTALL_FILES
+_SYS_VARS.ocaml= \
+ OCAML_SITELIBDIR
+
+# Default value of OCAML_USE_FINDLIB
+OCAML_USE_FINDLIB?= no
+
+# Default value of OCAML_USE_OASIS
+OCAML_USE_OASIS?= no
+
+# Default value of OCAML_USE_OASIS_DYNRUN
+OCAML_USE_OASIS_DYNRUN?= no
+
+# Default value of OCAML_USE_TOPKG
+OCAML_USE_TOPKG?= no
+
+# Default value of OCAML_USE_DUNE
+OCAML_USE_DUNE?= no
+
+OCAML_TOPKG_NAME?= ${PKGBASE:S/^ocaml-//}
+OCAML_TOPKG_DOCDIR?= ${PREFIX}/share/doc
+OCAML_TOPKG_FLAGS?= # empty
+OCAML_TOPKG_TARGETS?= # empty
+OCAML_TOPKG_OPTIONAL_TARGETS?= # empty
+OCAML_TOPKG_NATIVE_TARGETS?= # empty
+
+OPAM_INSTALL_FILES?= ${OCAML_TOPKG_NAME}
+DUNE_BUILD_FLAGS?= # empty
+DUNE_BUILD_TARGETS?= @install
+DUNE_BUILD_PACKAGES?= # empty
+
+# Default value of OASIS_BUILD_ARGS
+OASIS_BUILD_ARGS?= # empty
+
+#
+# Configure stuff for OASIS_DYNRUN
+#
+.if ${OCAML_USE_OASIS_DYNRUN} == "yes"
+.include "../../devel/ocaml-oasis/buildlink3.mk"
+OCAML_USE_OASIS= yes
+.endif
+
+#
+# Configure stuff for OASIS
+#
+.if ${OCAML_USE_OASIS} == "yes"
+OCAML_USE_FINDLIB= yes
+HAS_CONFIGURE= yes
+CONFIGURE_ARGS+= --destdir "${DESTDIR}"
+CONFIGURE_ARGS+= --prefix "${PREFIX}"
+# Force use of native code compiler according to setting
+.if ${OCAML_USE_OPT_COMPILER} == "yes"
+CONFIGURE_ARGS+= --override is_native true
+.else
+CONFIGURE_ARGS+= --override is_native false
+.endif
+.endif
+
+# Configure stuff for DUNE
+.if ${OCAML_USE_DUNE} == "yes"
+.include "../../devel/ocaml-dune/buildlink3.mk"
+OCAML_USE_OPAM?= yes
+OPAM_INSTALL_DIR?= _build/default
+.else
+OCAML_USE_OPAM?= no
+.endif
+
+# Configure stuff for OPAM
+.if ${OCAML_USE_OPAM} == "yes"
+.include "../../misc/ocaml-opaline/buildlink3.mk"
+OCAML_USE_FINDLIB= yes
+.endif
+
+# Configure stuff for TOPKG
+.if ${OCAML_USE_TOPKG} == "yes"
+.include "../../misc/ocaml-topkg/buildlink3.mk"
+OCAML_USE_FINDLIB= yes
+INSTALLATION_DIRS+= ${OCAML_SITELIBDIR}/${OCAML_TOPKG_NAME}
+.endif
+
+# Fallback value for OPAM_INSTALL_DIR
+OPAM_INSTALL_DIR?= .
+
+# Value for OCAML_SITELIBDIR
+OCAML_SITELIBDIR= lib/ocaml/site-lib
+MAKE_ENV+= OCAML_SITELIBDIR="${OCAML_SITELIBDIR}"
+PLIST_SUBST+= OCAML_SITELIB="${OCAML_SITELIBDIR}"
+
+PRINT_PLIST_AWK+= { gsub(/^.+\.cmx/, "$${PLIST.ocaml-opt}&") }
+PRINT_PLIST_AWK+= { gsub(/^.+\.a$$/, "$${PLIST.ocaml-opt}&") }
+PRINT_PLIST_AWK+= { gsub(/${OCAML_SITELIBDIR:S|/|\\/|g}/, \
+ "$${OCAML_SITELIB}"); \
+ print; next; }
+
+.if ${OCAML_USE_FINDLIB} == "yes"
+.include "../../devel/ocaml-findlib/buildlink3.mk"
+INSTALLATION_DIRS+= ${OCAML_SITELIBDIR}
+OCAML_FINDLIB_DIRS?= ${PKGBASE:S/^ocaml-//}
+OCAML_FINDLIB_REGISTER?= yes
+.endif
+
+#
+# Compiler stuff
+#
+
+#
+# OASIS targets
+#
+.if ${OCAML_USE_OASIS} == "yes"
+# OASIS uses ocamlbuild
+.include "../../devel/ocamlbuild/buildlink3.mk"
+.if ${OCAML_USE_OASIS_DYNRUN} == "yes"
+pre-configure:
+ ${RUN} cd ${WRKSRC} && ocamlfind ocamlc -linkpkg -package oasis.dynrun -o setup setup.ml && ${RM} setup.cmo setup.cmi
+
+OASIS_EXEC= ./setup
+.else
+OASIS_EXEC= ocaml setup.ml
+.endif
+
+# Redefine configure target
+do-configure:
+ ${RUN} cd ${WRKSRC} && \
+ ${SETENV} ${CONFIGURE_ENV} ${OASIS_EXEC} -configure ${CONFIGURE_ARGS}
+
+# Redefine build target
+do-build:
+ ${RUN} ${_ULIMIT_CMD} cd ${WRKSRC} && \
+ ${SETENV} ${MAKE_ENV} ${OASIS_EXEC} -build ${OASIS_BUILD_ARGS}
+
+# Redefine install target
+do-install:
+ ${RUN} cd ${WRKSRC} && \
+ ${OASIS_EXEC} -install --destdir ${DESTDIR} --prefix ${PREFIX}
+.endif
+
+#
+# topkg targets
+#
+.if ${OCAML_USE_TOPKG} == "yes"
+
+do-build:
+ ${RUN} ${_ULIMIT_CMD} cd ${WRKSRC} && \
+ ${SETENV} ${MAKE_ENV} ocaml pkg/pkg.ml build ${OCAML_TOPKG_FLAGS}
+
+.endif # ${OCAML_USE_TOPKG} == "yes"
+
+#
+# opam targets
+#
+.if ${OCAML_USE_OPAM} == "yes"
+
+do-install:
+ ${RUN} for i in ${OPAM_INSTALL_FILES}; do \
+ cd ${WRKSRC} && opaline -install-cmd "${INSTALL_DATA}" \
+ -exec-install-cmd "${INSTALL_PROGRAM}" \
+ -name $$i \
+ -destdir ${DESTDIR} \
+ -prefix ${PREFIX} \
+ -libdir ${PREFIX}/${OCAML_SITELIBDIR} \
+ -mandir ${PREFIX}/${PKGMANDIR} \
+ -docdir ${OCAML_TOPKG_DOCDIR}/$$i \
+ -stublibsdir ${PREFIX}/${OCAML_SITELIBDIR}/stublibs \
+ -bindir ${PREFIX}/bin \
+ ${OPAM_INSTALL_DIR}/$$i.install; \
+ done
+
+.endif # ${OCAML_USE_OPAM} == "yes"
+
+#
+# dune targets
+#
+.if ${OCAML_USE_DUNE} == "yes"
+
+do-build:
+.if !empty(DUNE_BUILD_PACKAGES)
+ ${RUN} ${_ULIMIT_CMD} \
+ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
+ dune build -j ${MAKE_JOBS:U1} \
+ ${DUNE_BUILD_FLAGS} -p ${DUNE_BUILD_PACKAGES:ts,} \
+ ${DUNE_BUILD_TARGETS}
+.else
+ ${RUN} ${_ULIMIT_CMD} \
+ cd ${WRKSRC} && dune build --profile release -j ${MAKE_JOBS:U1} \
+ ${DUNE_BUILD_FLAGS} ${DUNE_BUILD_TARGETS}
+.endif
+
+.endif # ${OCAML_USE_DUNE} == "yes"
+
+# Add dependency on ocaml.
+.include "../../lang/ocaml/buildlink3.mk"
+
+.endif # OCAML_MK
Index: pkgsrc/lang/ocaml/patches/patch-Makefile.build_config.in
diff -u /dev/null pkgsrc/lang/ocaml/patches/patch-Makefile.build_config.in:1.1
--- /dev/null Tue May 24 18:25:38 2022
+++ pkgsrc/lang/ocaml/patches/patch-Makefile.build_config.in Tue May 24 18:25:38 2022
@@ -0,0 +1,19 @@
+$NetBSD: patch-Makefile.build_config.in,v 1.1 2022/05/24 18:25:38 jaapb Exp $
+
+USE BSD_INSTALL_*
+
+--- Makefile.build_config.in.orig 2022-02-08 16:50:12.000000000 +0000
++++ Makefile.build_config.in
+@@ -20,9 +20,9 @@
+ # $(ROOTDIR) has been defined.
+
+ include $(ROOTDIR)/Makefile.config
+-INSTALL ?= @INSTALL@
+-INSTALL_DATA ?= @INSTALL_DATA@
+-INSTALL_PROG ?= @INSTALL_PROGRAM@
++INSTALL ?= $(BSD_INSTALL)
++INSTALL_DATA ?= $(BSD_INSTALL_DATA)
++INSTALL_PROG ?= $(BSD_INSTALL_SCRIPT)
+
+ # Whether to install the native toplevel (ocamlnat)
+ INSTALL_OCAMLNAT = @install_ocamlnat@
Index: pkgsrc/lang/ocaml/patches/patch-api__docgen_ocamldoc_Makefile
diff -u /dev/null pkgsrc/lang/ocaml/patches/patch-api__docgen_ocamldoc_Makefile:1.1
--- /dev/null Tue May 24 18:25:38 2022
+++ pkgsrc/lang/ocaml/patches/patch-api__docgen_ocamldoc_Makefile Tue May 24 18:25:38 2022
@@ -0,0 +1,40 @@
+$NetBSD: patch-api__docgen_ocamldoc_Makefile,v 1.1 2022/05/24 18:25:38 jaapb Exp $
+
+Install manpages with correct suffix
+
+--- api_docgen/ocamldoc/Makefile.orig 2022-02-21 15:57:25.000000000 +0000
++++ api_docgen/ocamldoc/Makefile
+@@ -19,7 +19,7 @@ include ../../ocamldoc/Makefile.best_oca
+ vpath %.mli ../../stdlib $(DOC_COMPILERLIBS_DIRS) $(DOC_STDLIB_DIRS)
+
+
+-man: build/man/Stdlib.3o
++man: build/man/Stdlib.3
+ latex: build/latex/Stdlib.tex
+ html: \
+ build/html/libref/Stdlib.html \
+@@ -34,7 +34,7 @@ DOC_ALL_INCLUDES = \
+
+ libref=$(stdlib_UNPREFIXED) $(otherlibref)
+
+-ALL_MAN= $(ALL_DOC:%=build/man/%.3o)
++ALL_MAN= $(ALL_DOC:%=build/man/%.3)
+ ALL_LATEX= $(ALL_DOC:%=build/latex/%.tex)
+
+ build/latex/ifocamldoc.tex: | build/latex
+@@ -60,7 +60,7 @@ build/libref/%.odoc: build/%.mld | build
+ $(OCAMLDOC_RUN) $(DOC_STDLIB_INCLUDES) -text $< -dump $@
+
+ ALL_COMPILED_DOC=$(ALL_DOC:%=build/%.odoc)
+-build/man/Stdlib.3o: $(ALL_COMPILED_DOC) | build/man
++build/man/Stdlib.3: $(ALL_COMPILED_DOC) | build/man
+ $(OCAMLDOC_RUN) -man -d build/man -man-mini \
+ -nostdlib -hide Stdlib -lib Stdlib -t "OCaml library" \
+ $(addprefix -load , $(ALL_COMPILED_DOC))
+@@ -123,5 +123,5 @@ build/latex/compilerlibs_input.tex: | bu
+ install:
+ $(MKDIR) "$(INSTALL_LIBRARIES_MAN_DIR)"
+ if test -d build/man; then \
+- $(INSTALL_DATA) build/man/*.3o "$(INSTALL_LIBRARIES_MAN_DIR)"; \
++ $(INSTALL_DATA) build/man/*.3 "$(INSTALL_LIBRARIES_MAN_DIR)"; \
+ fi
Index: pkgsrc/lang/ocaml/patches/patch-runtime_floats.c
diff -u /dev/null pkgsrc/lang/ocaml/patches/patch-runtime_floats.c:1.1
--- /dev/null Tue May 24 18:25:38 2022
+++ pkgsrc/lang/ocaml/patches/patch-runtime_floats.c Tue May 24 18:25:38 2022
@@ -0,0 +1,21 @@
+$NetBSD: patch-runtime_floats.c,v 1.1 2022/05/24 18:25:38 jaapb Exp $
+
+math.h on NetBSD 9 only declares copysign if _NETBSD_SOURCE is defined
+(implicitly or explicitly). However copysign is specified by POSIX
+since Issue 6, and derived form C99:
+ https://pubs.opengroup.org/onlinepubs/9699919799/
+
+Not filed upstream pending discussion within NetBSD.
+
+--- runtime/floats.c.orig 2022-02-21 15:57:25.000000000 +0000
++++ runtime/floats.c
+@@ -23,6 +23,9 @@
+ /* Needed for strtod_l */
+ #define _GNU_SOURCE
+
++/* Work around NetBSD 9 math.h bug of guarding copysign decl */
++#define _NETBSD_SOURCE
++
+ #include <math.h>
+ #include <stdio.h>
+ #include <stdlib.h>
Index: pkgsrc/lang/ocaml/patches/patch-runtime_sak.c
diff -u /dev/null pkgsrc/lang/ocaml/patches/patch-runtime_sak.c:1.1
--- /dev/null Tue May 24 18:25:38 2022
+++ pkgsrc/lang/ocaml/patches/patch-runtime_sak.c Tue May 24 18:25:38 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-runtime_sak.c,v 1.1 2022/05/24 18:25:38 jaapb Exp $
+
+Explicit cast to int to eliminate warning
+
+--- runtime/sak.c.orig 2022-02-21 15:57:25.000000000 +0000
++++ runtime/sak.c
+@@ -123,7 +123,7 @@ void add_stdlib_prefix(int count, char_o
+ } else {
+ /* name is a null-terminated string, so an empty string simply has the
+ null-terminator "capitalised". */
+- *name = toupper_os(*name);
++ *name = toupper_os((int) *name);
+ printf_os(T(" stdlib__%s"), name);
+ }
+ }
Home |
Main Index |
Thread Index |
Old Index