pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/ocaml Updated lang/ocaml to version 4.14.0.
details: https://anonhg.NetBSD.org/pkgsrc/rev/26f7b93fadb7
branches: trunk
changeset: 379898:26f7b93fadb7
user: jaapb <jaapb%pkgsrc.org@localhost>
date: Tue May 24 18:25:38 2022 +0000
description:
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.
diffstat:
lang/ocaml/Makefile | 77 +-
lang/ocaml/Makefile.common | 6 +-
lang/ocaml/PLIST | 844 +++++-----
lang/ocaml/buildlink3.mk | 7 +-
lang/ocaml/distinfo | 37 +-
lang/ocaml/native.mk | 47 +
lang/ocaml/ocaml.mk | 253 +++
lang/ocaml/options.mk | 10 +-
lang/ocaml/patches/patch-Makefile | 45 +-
lang/ocaml/patches/patch-Makefile.build_config.in | 19 +
lang/ocaml/patches/patch-Makefile.common.in | 19 -
lang/ocaml/patches/patch-api__docgen_ocamldoc_Makefile | 40 +
lang/ocaml/patches/patch-configure | 145 +-
lang/ocaml/patches/patch-lex_Makefile | 26 +-
lang/ocaml/patches/patch-man_Makefile | 17 +-
lang/ocaml/patches/patch-ocamldoc_Makefile | 8 +-
lang/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common | 8 +-
lang/ocaml/patches/patch-otherlibs_systhreads_Makefile | 23 +-
lang/ocaml/patches/patch-otherlibs_unix_Makefile | 12 +-
lang/ocaml/patches/patch-runtime_Makefile | 35 +-
lang/ocaml/patches/patch-runtime_floats.c | 21 +
lang/ocaml/patches/patch-runtime_sak.c | 15 +
lang/ocaml/patches/patch-tools_Makefile | 12 +-
lang/ocaml/patches/patch-tools_ocamlmklib.ml | 16 +-
lang/ocaml/patches/patch-yacc_Makefile | 10 +-
25 files changed, 1039 insertions(+), 713 deletions(-)
diffs (truncated from 2678 to 300 lines):
diff -r d1fc8a2b3856 -r 26f7b93fadb7 lang/ocaml/Makefile
--- a/lang/ocaml/Makefile Tue May 24 18:20:45 2022 +0000
+++ b/lang/ocaml/Makefile Tue May 24 18:25:38 2022 +0000
@@ -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_GCC_RUNTIME= yes
-PLIST_VARS+= ocaml-stub ocaml-prof ocaml-opt ocaml-nat ocaml-spacetime \
- instrumented_runtime
-
.include "options.mk"
-###
-### PLIST components
-###
+.include "native.mk"
-# 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
+# Options
-# 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
-
-# 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 @@
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 @@
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"
diff -r d1fc8a2b3856 -r 26f7b93fadb7 lang/ocaml/Makefile.common
--- a/lang/ocaml/Makefile.common Tue May 24 18:20:45 2022 +0000
+++ b/lang/ocaml/Makefile.common Tue May 24 18:25:38 2022 +0000
@@ -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
diff -r d1fc8a2b3856 -r 26f7b93fadb7 lang/ocaml/PLIST
--- a/lang/ocaml/PLIST Tue May 24 18:20:45 2022 +0000
+++ b/lang/ocaml/PLIST Tue May 24 18:25:38 2022 +0000
@@ -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 @@
${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/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_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/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-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-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-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-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
Home |
Main Index |
Thread Index |
Old Index