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 4.11.1.
details: https://anonhg.NetBSD.org/pkgsrc/rev/69bf49905de2
branches: trunk
changeset: 443219:69bf49905de2
user: jaapb <jaapb%pkgsrc.org@localhost>
date: Wed Dec 09 10:33:04 2020 +0000
description:
Updated lang/ocaml to 4.11.1.
Patches for solaris and friends are reinstated (thanks jperkin@)
Also thanks to he@ for testing on powerpc and arm
Highlights for 4.10.0:
* A new best-fit allocator for the major heap which reducing both GC cost
and memory usage.
* Immutable strings are now enforced at configuration time
* User-defined indexing operators for multidimensional arrays
* Miscellaneous improvements to the manual
* A more precise exhaustiveness check for GADTs
* Many bug fixes
Highlights for 4.11.0:
* Statmemprof: a new statistical memory profiler
* A new instrumented runtime that logs runtime statistics in a standard
format
* A native backend for the RISC-V architecture
* Improved backtraces that refer to function names
* Suppport for recursive and yet unboxed types
* A quoted extension syntax for ppxs.
* Many quality of life improvements
* Many bug fixes.
4.11.1 is a bugfix release. Full details in the CHANGELOG included with
the distribution.
diffstat:
lang/ocaml/Makefile | 20 +-
lang/ocaml/Makefile.common | 7 +-
lang/ocaml/PLIST | 62 ++++++-
lang/ocaml/buildlink3.mk | 6 +-
lang/ocaml/distinfo | 34 ++-
lang/ocaml/hacks.mk | 2 +-
lang/ocaml/options.mk | 2 +-
lang/ocaml/patches/patch-Makefile | 10 +-
lang/ocaml/patches/patch-Makefile.common.in | 8 +-
lang/ocaml/patches/patch-asmcomp_amd64_emit.mlp | 2 +-
lang/ocaml/patches/patch-asmrun_amd64.S | 15 -
lang/ocaml/patches/patch-configure | 85 ++++++++-
lang/ocaml/patches/patch-lex_Makefile | 6 +-
lang/ocaml/patches/patch-ocamldoc_Makefile | 10 +-
lang/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common | 17 +-
lang/ocaml/patches/patch-otherlibs_systhreads_Makefile | 20 +-
lang/ocaml/patches/patch-otherlibs_systhreads_st__stubs.c | 16 +
lang/ocaml/patches/patch-runtime_Makefile | 2 +-
lang/ocaml/patches/patch-runtime_amd64.S | 15 +
lang/ocaml/patches/patch-testsuite_tests_lib-systhreads_testyield.ml | 17 +-
lang/ocaml/patches/patch-tools_Makefile | 8 +-
lang/ocaml/patches/patch-tools_ocamlmklib | 52 ------
lang/ocaml/patches/patch-tools_ocamlmklib.ml | 52 ++++++
lang/ocaml/patches/patch-yacc_Makefile | 12 +-
24 files changed, 296 insertions(+), 184 deletions(-)
diffs (truncated from 960 to 300 lines):
diff -r 2d508b940349 -r 69bf49905de2 lang/ocaml/Makefile
--- a/lang/ocaml/Makefile Wed Dec 09 10:12:14 2020 +0000
+++ b/lang/ocaml/Makefile Wed Dec 09 10:33:04 2020 +0000
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.137 2020/12/08 08:53:16 he Exp $
+# $NetBSD: Makefile,v 1.138 2020/12/09 10:33:04 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
@@ -15,11 +14,6 @@
USE_LIBTOOL= yes
USE_GNU_CONFIGURE_HOST= no
-# This actually works fine, but requires some patches that the maintainer
-# insists on removing every time the package is updated, so we unfortunately
-# have to mark it broken to stop wasting people's valuable time investigating.
-BROKEN_ON_PLATFORM= SunOS-*-*
-
#USE_GCC_RUNTIME= yes
PLIST_VARS+= ocaml-stub ocaml-prof ocaml-opt ocaml-nat ocaml-spacetime \
@@ -45,6 +39,7 @@
!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) && \
@@ -56,11 +51,11 @@
# 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")
+ (${MACHINE_ARCH} == "aarch64")
. if !empty(MACHINE_PLATFORM:MLinux-*-*) || \
!empty(MACHINE_PLATFORM:MFreeBSD-*-*) || \
!empty(MACHINE_PLATFORM:MDragonFly-*-*) || \
- !empty(MACHINE_PLATFORM:MNetBSD-*-*) || \
+ (!empty(MACHINE_PLATFORM:MNetBSD-*-*) && empty(MACHINE_PLATFORM:MNetBSD-*-powerpc)) || \
!empty(MACHINE_PLATFORM:MDarwin-*-*) || \
!empty(MACHINE_PLATFORM:MSunOS-*-*)
PLIST.ocaml-nat= yes
@@ -104,6 +99,7 @@
.endif
do-test:
+ cd ${WRKSRC} && ${MAKE_PROGRAM} ${TEST_PROGRAM}
cd ${WRKSRC}/testsuite && ${MAKE_PROGRAM} all
.if ${OPSYS} == "Darwin"
@@ -111,8 +107,8 @@
post-install: fix-darwin-install-name
fix-darwin-install-name:
for f in ${DESTDIR}${PREFIX}/lib/ocaml/*.so \
- ${DESTDIR}${PREFIX}/lib/ocaml/stublibs/*.so; do \
- install_name_tool -id `${ECHO} $$f | ${SED} -e 's,${DESTDIR},,g'` $$f; \
+ ${DESTDIR}${PREFIX}/lib/ocaml/stublibs/*.so; do \
+ install_name_tool -id `${ECHO} $$f | ${SED} -e 's,${DESTDIR},,g'` $$f; \
done
.endif
diff -r 2d508b940349 -r 69bf49905de2 lang/ocaml/Makefile.common
--- a/lang/ocaml/Makefile.common Wed Dec 09 10:12:14 2020 +0000
+++ b/lang/ocaml/Makefile.common Wed Dec 09 10:33:04 2020 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.60 2020/04/15 09:50:54 jaapb Exp $
+# $NetBSD: Makefile.common,v 1.61 2020/12/09 10:33:04 jaapb Exp $
# used by x11/labltk/Makefile
-DISTNAME= ocaml-4.09.1
+DISTNAME= ocaml-4.11.1
CATEGORIES= lang
-MASTER_SITES= http://caml.inria.fr/pub/distrib/ocaml-4.09/
+MASTER_SITES= http://caml.inria.fr/pub/distrib/ocaml-4.11/
#EXTRACT_SUFX= .tar.bz2
MAINTAINER= jaapb%NetBSD.org@localhost
@@ -21,6 +21,7 @@
#CONFIGURE_ARGS+= -with-pthread
#CONFIGURE_ARGS+= -host ${MACHINE_GNU_PLATFORM:Q}
#CONFIGURE_ARGS+= -mandir ${PREFIX}/lib/ocaml/${PKGMANDIR}
+#CONFIGURE_ARGS+= --without-x
#CPPFLAGS+= -DDB_DBM_HSEARCH
#DISTINFO_FILE= ${.CURDIR}/../../lang/ocaml/distinfo
diff -r 2d508b940349 -r 69bf49905de2 lang/ocaml/PLIST
--- a/lang/ocaml/PLIST Wed Dec 09 10:12:14 2020 +0000
+++ b/lang/ocaml/PLIST Wed Dec 09 10:33:04 2020 +0000
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.53 2020/04/15 09:50:54 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.54 2020/12/09 10:33:04 jaapb Exp $
bin/ocaml
-${PLIST.instrumented_runtime}bin/ocaml-instr-graph
-${PLIST.instrumented_runtime}bin/ocaml-instr-report
+@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
@@ -30,9 +30,9 @@
${PLIST.ocaml-opt}bin/ocamlopt
${PLIST.ocaml-opt}bin/ocamlopt.byte
${PLIST.ocaml-opt}bin/ocamlopt.opt
-@comment 4.09 bin/ocamloptp
-@comment 4.09 bin/ocamloptp.byte
-@comment 4.09 ${PLIST.ocaml-opt}bin/ocamloptp.opt
+${PLIST.ocaml-opt}bin/ocamloptp
+${PLIST.ocaml-opt}bin/ocamloptp.byte
+${PLIST.ocaml-opt}bin/ocamloptp.opt
bin/ocamlprof
bin/ocamlprof.byte
${PLIST.ocaml-opt}bin/ocamlprof.opt
@@ -79,7 +79,11 @@
lib/ocaml/caml/config.h
lib/ocaml/caml/custom.h
lib/ocaml/caml/debugger.h
+lib/ocaml/caml/domain.h
+lib/ocaml/caml/domain_state.h
+lib/ocaml/caml/domain_state.tbl
lib/ocaml/caml/dynlink.h
+lib/ocaml/caml/eventlog.h
lib/ocaml/caml/exec.h
lib/ocaml/caml/fail.h
lib/ocaml/caml/finalise.h
@@ -103,6 +107,7 @@
lib/ocaml/caml/major_gc.h
lib/ocaml/caml/md5.h
lib/ocaml/caml/memory.h
+lib/ocaml/caml/memprof.h
lib/ocaml/caml/minor_gc.h
lib/ocaml/caml/misc.h
lib/ocaml/caml/mlvalues.h
@@ -376,6 +381,11 @@
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_id.cmti
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_id.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_id.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_middle_end.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_middle_end.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_middle_end.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_middle_end.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_middle_end.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_offsets.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_offsets.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_offsets.cmti
@@ -396,6 +406,11 @@
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm.cmti
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm_helpers.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm_helpers.cmt
+${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/cmmgen.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen.cmti
@@ -409,6 +424,9 @@
lib/ocaml/compiler-libs/cmo_format.cmi
lib/ocaml/compiler-libs/cmo_format.cmti
lib/ocaml/compiler-libs/cmo_format.mli
+lib/ocaml/compiler-libs/cmt2annot.cmi
+lib/ocaml/compiler-libs/cmt2annot.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmt2annot.cmx
lib/ocaml/compiler-libs/cmt_format.cmi
lib/ocaml/compiler-libs/cmt_format.cmt
lib/ocaml/compiler-libs/cmt_format.cmti
@@ -538,6 +556,11 @@
lib/ocaml/compiler-libs/docstrings.cmti
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/docstrings.cmx
lib/ocaml/compiler-libs/docstrings.mli
+lib/ocaml/compiler-libs/domainstate.cmi
+lib/ocaml/compiler-libs/domainstate.cmt
+lib/ocaml/compiler-libs/domainstate.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/domainstate.cmx
+lib/ocaml/compiler-libs/domainstate.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/effect_analysis.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/effect_analysis.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/effect_analysis.cmti
@@ -777,6 +800,11 @@
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmti
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linear.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linear.cmt
+${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/linearize.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linearize.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linearize.cmti
@@ -871,7 +899,7 @@
lib/ocaml/compiler-libs/ocamlcommon.cma
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamlcommon.cmxa
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamlmiddleend.a
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamlmiddleend.cma
+lib/ocaml/compiler-libs/ocamlmiddleend.cma
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamlmiddleend.cmxa
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamloptcomp.a
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamloptcomp.cma
@@ -1305,6 +1333,11 @@
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/traverse_for_exported_symbols.cmti
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/traverse_for_exported_symbols.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/traverse_for_exported_symbols.mli
+lib/ocaml/compiler-libs/type_immediacy.cmi
+lib/ocaml/compiler-libs/type_immediacy.cmt
+lib/ocaml/compiler-libs/type_immediacy.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/type_immediacy.cmx
+lib/ocaml/compiler-libs/type_immediacy.mli
lib/ocaml/compiler-libs/typeclass.cmi
lib/ocaml/compiler-libs/typeclass.cmt
lib/ocaml/compiler-libs/typeclass.cmti
@@ -1330,6 +1363,11 @@
lib/ocaml/compiler-libs/typedecl_properties.cmti
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/typedecl_properties.cmx
lib/ocaml/compiler-libs/typedecl_properties.mli
+lib/ocaml/compiler-libs/typedecl_separability.cmi
+lib/ocaml/compiler-libs/typedecl_separability.cmt
+lib/ocaml/compiler-libs/typedecl_separability.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/typedecl_separability.cmx
+lib/ocaml/compiler-libs/typedecl_separability.mli
lib/ocaml/compiler-libs/typedecl_unboxed.cmi
lib/ocaml/compiler-libs/typedecl_unboxed.cmt
lib/ocaml/compiler-libs/typedecl_unboxed.cmti
@@ -1445,6 +1483,7 @@
${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/ocaml/dynlink_types.cmx
lib/ocaml/ephemeron.ml
lib/ocaml/ephemeron.mli
+lib/ocaml/eventlog_metadata
lib/ocaml/expunge
lib/ocaml/extract_crc
lib/ocaml/filename.ml
@@ -2183,6 +2222,7 @@
man/man3/Digest.3
man/man3/Docstrings.3
man/man3/Docstrings.WithMenhir.3
+man/man3/Domainstate.3
man/man3/Dynlink.3
man/man3/Ephemeron.3
man/man3/Ephemeron.GenHashTable.3
@@ -2206,6 +2246,7 @@
man/man3/Format.3
man/man3/Fun.3
man/man3/Gc.3
+man/man3/Gc.Memprof.3
man/man3/Genlex.3
man/man3/Hashtbl.3
man/man3/Hashtbl.HashedType.3
@@ -2253,6 +2294,7 @@
man/man3/Misc.Error_style.3
man/man3/Misc.Int_literal_converter.3
man/man3/Misc.LongString.3
+man/man3/Misc.Magic_number.3
man/man3/Misc.Stdlib.3
man/man3/Misc.Stdlib.Array.3
man/man3/Misc.Stdlib.List.3
@@ -2296,8 +2338,6 @@
man/man3/Parser.MenhirInterpreter.3
man/man3/Parsetree.3
man/man3/Parsing.3
-man/man3/Pervasives.3
-man/man3/Pervasives.LargeFile.3
man/man3/Pparse.3
man/man3/Pprintast.3
man/man3/Printast.3
@@ -2391,6 +2431,10 @@
man/man3/Strongly_connected_components.S.Id.3
man/man3/Syntaxerr.3
man/man3/Sys.3
+man/man3/Sys.Immediate64.3
+man/man3/Sys.Immediate64.Immediate.3
+man/man3/Sys.Immediate64.Make.3
+man/man3/Sys.Immediate64.Non_immediate.3
man/man3/Targetint.3
man/man3/Terminfo.3
man/man3/Thread.3
diff -r 2d508b940349 -r 69bf49905de2 lang/ocaml/buildlink3.mk
--- a/lang/ocaml/buildlink3.mk Wed Dec 09 10:12:14 2020 +0000
+++ b/lang/ocaml/buildlink3.mk Wed Dec 09 10:33:04 2020 +0000
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.54 2020/01/14 19:53:35 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.55 2020/12/09 10:33:04 jaapb Exp $
BUILDLINK_TREE+= ocaml
.if !defined(OCAML_BUILDLINK3_MK)
OCAML_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.ocaml+= ocaml>=4.09.0
-BUILDLINK_ABI_DEPENDS.ocaml+= ocaml>=4.09.0
+BUILDLINK_API_DEPENDS.ocaml+= ocaml>=4.11.1
Home |
Main Index |
Thread Index |
Old Index