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.09.0.
details: https://anonhg.NetBSD.org/pkgsrc/rev/804da731964a
branches: trunk
changeset: 421307:804da731964a
user: jaapb <jaapb%pkgsrc.org@localhost>
date: Tue Jan 14 19:53:35 2020 +0000
description:
Updated lang/ocaml to version 4.09.0.
Highlights of this release are:
* new optimisations, in particular for affine functions in matches;
* the graphics library was moved out of the main distribution;
* the vmthread library was removed;
* support for compiler plugins was removed;
* many bug fixes.
For more details see the Changes file in the distribution.
diffstat:
lang/ocaml/Makefile | 23 +-
lang/ocaml/Makefile.common | 14 +-
lang/ocaml/PLIST | 428 +++++-----
lang/ocaml/buildlink3.mk | 6 +-
lang/ocaml/distinfo | 46 +-
lang/ocaml/hacks.mk | 2 +-
lang/ocaml/options.mk | 3 +-
lang/ocaml/patches/patch-Makefile | 3 +-
lang/ocaml/patches/patch-Makefile.common.in | 3 +-
lang/ocaml/patches/patch-asmcomp_amd64_emit.mlp | 5 +-
lang/ocaml/patches/patch-asmcomp_asmlink.ml | 20 -
lang/ocaml/patches/patch-asmrun_amd64.S | 3 +-
lang/ocaml/patches/patch-configure | 77 +-
lang/ocaml/patches/patch-driver_compenv.ml | 14 -
lang/ocaml/patches/patch-driver_main.ml | 14 -
lang/ocaml/patches/patch-driver_main_args.ml | 41 -
lang/ocaml/patches/patch-driver_main_args.mli | 14 -
lang/ocaml/patches/patch-driver_optmain.ml | 14 -
lang/ocaml/patches/patch-lex_Makefile | 11 +-
lang/ocaml/patches/patch-ocamldoc_Makefile | 3 +-
lang/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common | 3 +-
lang/ocaml/patches/patch-otherlibs_systhreads_Makefile | 5 +-
lang/ocaml/patches/patch-otherlibs_systhreads_st__stubs.c | 17 -
lang/ocaml/patches/patch-otherlibs_threads_Makefile | 31 -
lang/ocaml/patches/patch-runtime_Makefile | 3 +-
lang/ocaml/patches/patch-tools_Makefile | 9 +-
lang/ocaml/patches/patch-tools_ocamlcp.ml | 14 -
lang/ocaml/patches/patch-tools_ocamlmklib | 2 +-
lang/ocaml/patches/patch-tools_ocamloptp.ml | 14 -
lang/ocaml/patches/patch-utils_clflags.ml | 16 -
lang/ocaml/patches/patch-utils_clflags.mli | 14 -
lang/ocaml/patches/patch-yacc_Makefile | 3 +-
32 files changed, 319 insertions(+), 556 deletions(-)
diffs (truncated from 1648 to 300 lines):
diff -r 47fe2dca7fd1 -r 804da731964a lang/ocaml/Makefile
--- a/lang/ocaml/Makefile Tue Jan 14 17:44:02 2020 +0000
+++ b/lang/ocaml/Makefile Tue Jan 14 19:53:35 2020 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.131 2019/11/24 09:23:13 adam Exp $
+# $NetBSD: Makefile,v 1.132 2020/01/14 19:53:35 jaapb Exp $
.include "Makefile.common"
-PKGREVISION= 2
+#CONFIGURE_ENV+= disable_x11=yes
BUILD_TARGET= world
MAKE_JOBS_SAFE= no
@@ -13,6 +13,8 @@
USE_LIBTOOL= yes
USE_GNU_CONFIGURE_HOST= no
+#USE_GCC_RUNTIME= yes
+
PLIST_VARS+= ocaml-stub ocaml-prof ocaml-opt ocaml-nat ocaml-spacetime \
instrumented_runtime
@@ -38,7 +40,7 @@
BUILD_TARGET+= opt opt.opt
PLIST.ocaml-opt= yes
. if empty(MACHINE_PLATFORM:MDarwin-*-powerpc) && \
- empty(MACHINE_PLATFORM:MSunOS-*-*) && \
+ empty(MACHINE_PLATFORM:MSunOS-*-i386) && \
(${MACHINE_ARCH} != "aarch64")
PLIST.ocaml-prof= yes
. endif
@@ -97,15 +99,12 @@
do-test:
cd ${WRKSRC}/testsuite && ${MAKE_PROGRAM} all
-.if ${OPSYS} == "Darwin"
-.PHONY: fix-darwin-install-name
-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; \
- 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"
diff -r 47fe2dca7fd1 -r 804da731964a lang/ocaml/Makefile.common
--- a/lang/ocaml/Makefile.common Tue Jan 14 17:44:02 2020 +0000
+++ b/lang/ocaml/Makefile.common Tue Jan 14 19:53:35 2020 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.57 2019/11/24 09:23:13 adam Exp $
+# $NetBSD: Makefile.common,v 1.58 2020/01/14 19:53:35 jaapb Exp $
# used by x11/labltk/Makefile
-DISTNAME= ocaml-4.08.1
+DISTNAME= ocaml-4.09.0
CATEGORIES= lang
-MASTER_SITES= http://caml.inria.fr/pub/distrib/ocaml-4.08/
+MASTER_SITES= http://caml.inria.fr/pub/distrib/ocaml-4.09/
#EXTRACT_SUFX= .tar.bz2
MAINTAINER= jaapb%NetBSD.org@localhost
@@ -33,6 +33,14 @@
INSTALL_UNSTRIPPED= yes
.endif
+#.if ${OPSYS} == "Darwin"
+#CONFIGURE_ENV+= CC="${CC} -arch ${MACHINE_ARCH} ${CFLAGS}"
+#CONFIGURE_ENV+= ASPP="${CC} -arch ${MACHINE_ARCH} -c"
+#CONFIGURE_ENV+= AS="as -arch ${MACHINE_ARCH}"
+#.else
+#CONFIGURE_ENV+= CC="${CC} ${CFLAGS}"
+#.endif
+
.include "../../mk/bdb.buildlink3.mk"
#BDB_LINK= ${BDB_LIBS}
diff -r 47fe2dca7fd1 -r 804da731964a lang/ocaml/PLIST
--- a/lang/ocaml/PLIST Tue Jan 14 17:44:02 2020 +0000
+++ b/lang/ocaml/PLIST Tue Jan 14 19:53:35 2020 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.51 2019/08/24 10:54:23 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.52 2020/01/14 19:53:35 jaapb Exp $
bin/ocaml
${PLIST.instrumented_runtime}bin/ocaml-instr-graph
${PLIST.instrumented_runtime}bin/ocaml-instr-report
@@ -30,9 +30,9 @@
${PLIST.ocaml-opt}bin/ocamlopt
${PLIST.ocaml-opt}bin/ocamlopt.byte
${PLIST.ocaml-opt}bin/ocamlopt.opt
-bin/ocamloptp
-bin/ocamloptp.byte
-${PLIST.ocaml-opt}bin/ocamloptp.opt
+@comment 4.09 bin/ocamloptp
+@comment 4.09 bin/ocamloptp.byte
+@comment 4.09 ${PLIST.ocaml-opt}bin/ocamloptp.opt
bin/ocamlprof
bin/ocamlprof.byte
${PLIST.ocaml-opt}bin/ocamlprof.opt
@@ -92,9 +92,9 @@
lib/ocaml/caml/hooks.h
lib/ocaml/caml/instrtrace.h
lib/ocaml/caml/instruct.h
-lib/ocaml/caml/int64_emul.h
-lib/ocaml/caml/int64_format.h
-lib/ocaml/caml/int64_native.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
@@ -129,46 +129,48 @@
lib/ocaml/caml/weak.h
lib/ocaml/camlheader
lib/ocaml/camlheader_ur
+lib/ocaml/camlheaderd
+lib/ocaml/camlheaderi
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
-${PLIST.ocaml-prof}lib/ocaml/camlinternalFormat.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/camlinternalFormat.p.cmx
+@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
-${PLIST.ocaml-prof}lib/ocaml/camlinternalFormatBasics.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/camlinternalFormatBasics.p.cmx
+@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
-${PLIST.ocaml-prof}lib/ocaml/camlinternalLazy.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/camlinternalLazy.p.cmx
+@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
-${PLIST.ocaml-prof}lib/ocaml/camlinternalMod.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/camlinternalMod.p.cmx
+@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
-${PLIST.ocaml-prof}lib/ocaml/camlinternalOO.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/camlinternalOO.p.cmx
+@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
@@ -258,6 +260,11 @@
${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
@@ -334,6 +341,11 @@
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/clambda.cmti
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/clambda.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/clambda.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/clambda_primitives.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/clambda_primitives.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/clambda_primitives.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/clambda_primitives.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/clambda_primitives.mli
lib/ocaml/compiler-libs/clflags.cmi
lib/ocaml/compiler-libs/clflags.cmt
lib/ocaml/compiler-libs/clflags.cmti
@@ -389,6 +401,11 @@
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen.cmti
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen_state.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen_state.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen_state.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen_state.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen_state.mli
lib/ocaml/compiler-libs/cmo_format.cmi
lib/ocaml/compiler-libs/cmo_format.cmti
lib/ocaml/compiler-libs/cmo_format.mli
@@ -400,6 +417,9 @@
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmx_format.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmx_format.cmti
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmx_format.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmxs_format.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmxs_format.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmxs_format.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/coloring.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/coloring.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/coloring.cmti
@@ -410,26 +430,26 @@
${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
-lib/ocaml/compiler-libs/compdynlink.cmi
-lib/ocaml/compiler-libs/compdynlink.cmt
-lib/ocaml/compiler-libs/compdynlink.cmti
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compdynlink.cmx
-lib/ocaml/compiler-libs/compdynlink.mli
-lib/ocaml/compiler-libs/compdynlink_common.cmi
-lib/ocaml/compiler-libs/compdynlink_common.cmt
-lib/ocaml/compiler-libs/compdynlink_common.cmti
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compdynlink_common.cmx
-lib/ocaml/compiler-libs/compdynlink_common.mli
-lib/ocaml/compiler-libs/compdynlink_platform_intf.cmi
-lib/ocaml/compiler-libs/compdynlink_platform_intf.cmt
-lib/ocaml/compiler-libs/compdynlink_platform_intf.cmti
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compdynlink_platform_intf.cmx
-lib/ocaml/compiler-libs/compdynlink_platform_intf.mli
-lib/ocaml/compiler-libs/compdynlink_types.cmi
-lib/ocaml/compiler-libs/compdynlink_types.cmt
-lib/ocaml/compiler-libs/compdynlink_types.cmti
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compdynlink_types.cmx
-lib/ocaml/compiler-libs/compdynlink_types.mli
+@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
@@ -460,11 +480,14 @@
lib/ocaml/compiler-libs/compmisc.cmti
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compmisc.cmx
lib/ocaml/compiler-libs/compmisc.mli
-lib/ocaml/compiler-libs/compplugin.cmi
-lib/ocaml/compiler-libs/compplugin.cmt
-lib/ocaml/compiler-libs/compplugin.cmti
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compplugin.cmx
-lib/ocaml/compiler-libs/compplugin.mli
+lib/ocaml/compiler-libs/compute_ranges.cmi
+lib/ocaml/compiler-libs/compute_ranges.cmt
+lib/ocaml/compiler-libs/compute_ranges.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compute_ranges.cmx
+lib/ocaml/compiler-libs/compute_ranges.mli
+lib/ocaml/compiler-libs/compute_ranges_intf.cmi
+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
@@ -475,6 +498,11 @@
lib/ocaml/compiler-libs/consistbl.cmti
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/consistbl.cmx
lib/ocaml/compiler-libs/consistbl.mli
+lib/ocaml/compiler-libs/convert_primitives.cmi
+lib/ocaml/compiler-libs/convert_primitives.cmt
+lib/ocaml/compiler-libs/convert_primitives.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/convert_primitives.cmx
Home |
Main Index |
Thread Index |
Old Index