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.08.1.
details: https://anonhg.NetBSD.org/pkgsrc/rev/a95fd8762110
branches: trunk
changeset: 400205:a95fd8762110
user: jaapb <jaapb%pkgsrc.org@localhost>
date: Sat Aug 24 10:54:23 2019 +0000
description:
Updated lang/ocaml to 4.08.1.
4.08.1 is a bugfix release, fixing compilation failures in presence of the
-pack option, and dynlinking failures.
Highlights in 4.08.0 are:
* Binding operators (let*, let+, and*, etc). They can be used to
streamline monadic code.
* open now applies to arbitrary module expression in structures and to
applicative paths in signatures.
* A new notion of (user-defined) "alerts" generalizes the deprecated
warning.
* New modules in the standard library: Fun, Bool, Int, Option, Result.
* A significant number of new functions in Float, including FMA support,
and a new Float.Array submodule.
* Source highlighting for errors and warnings in batch mode.
* Many error messages were improved.
* Improved AFL instrumentation for objects and lazy values.
diffstat:
lang/ocaml/Makefile | 43 +-
lang/ocaml/Makefile.common | 63 +-
lang/ocaml/PLIST | 814 +++++++---
lang/ocaml/buildlink3.mk | 14 +-
lang/ocaml/distinfo | 34 +-
lang/ocaml/hacks.mk | 14 +-
lang/ocaml/options.mk | 14 +-
lang/ocaml/patches/patch-Makefile | 20 +-
lang/ocaml/patches/patch-Makefile.common.in | 18 +
lang/ocaml/patches/patch-asmcomp_amd64_emit.mlp | 3 +-
lang/ocaml/patches/patch-asmrun_amd64.S | 7 +-
lang/ocaml/patches/patch-configure | 224 +--
lang/ocaml/patches/patch-driver_compenv.ml | 10 +-
lang/ocaml/patches/patch-lex_Makefile | 23 +
lang/ocaml/patches/patch-ocamldoc_Makefile | 14 +
lang/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common | 13 +
lang/ocaml/patches/patch-otherlibs_systhreads_Makefile | 30 +-
lang/ocaml/patches/patch-otherlibs_threads_Makefile | 13 +-
lang/ocaml/patches/patch-runtime_Makefile | 53 +
lang/ocaml/patches/patch-tools_Makefile | 14 +
lang/ocaml/patches/patch-tools_ocamlmklib | 32 +-
lang/ocaml/patches/patch-yacc_Makefile | 16 +-
22 files changed, 886 insertions(+), 600 deletions(-)
diffs (truncated from 2423 to 300 lines):
diff -r 8d663f0e8a7a -r a95fd8762110 lang/ocaml/Makefile
--- a/lang/ocaml/Makefile Sat Aug 24 09:01:04 2019 +0000
+++ b/lang/ocaml/Makefile Sat Aug 24 10:54:23 2019 +0000
@@ -1,19 +1,19 @@
-# $NetBSD: Makefile,v 1.126 2019/08/02 03:13:06 schmonz Exp $
+# $NetBSD: Makefile,v 1.127 2019/08/24 10:54:23 jaapb Exp $
.include "Makefile.common"
-PKGREVISION= 4
-
-CONFIGURE_ENV+= disable_x11=yes
+#CONFIGURE_ENV+= disable_x11=yes
BUILD_TARGET= world
MAKE_JOBS_SAFE= no
UNLIMIT_RESOURCES= stacksize
USE_TOOLS+= bash
-USE_FEATURES+= strnlen
+USE_LANGUAGES+= c
+USE_LIBTOOL= yes
+USE_GNU_CONFIGURE_HOST= no
-USE_GCC_RUNTIME= yes
+#USE_GCC_RUNTIME= yes
PLIST_VARS+= ocaml-stub ocaml-prof ocaml-opt ocaml-nat ocaml-spacetime \
instrumented_runtime
@@ -37,13 +37,12 @@
.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
!empty(MACHINE_ARCH:M*arm*) || (${MACHINE_ARCH} == "aarch64") || \
(${MACHINE_ARCH} == "x86_64")
-BUILD_TARGET+= opt opt.opt
+BUILD_TARGET+= opt opt.opt
PLIST.ocaml-opt= yes
. if empty(MACHINE_PLATFORM:MDarwin-*-powerpc) && \
empty(MACHINE_PLATFORM:MSunOS-*-i386) && \
- empty(MACHINE_PLATFORM:MNetBSD-*-sparc) && \
(${MACHINE_ARCH} != "aarch64")
-PLIST.ocaml-prof=yes
+PLIST.ocaml-prof= yes
. endif
.endif
@@ -57,20 +56,20 @@
(!empty(MACHINE_PLATFORM:MNetBSD-*-*) && empty(MACHINE_PLATFORM:MNetBSD-*-powerpc)) || \
!empty(MACHINE_PLATFORM:MDarwin-*-*) || \
!empty(MACHINE_PLATFORM:MSunOS-*-*)
-PLIST.ocaml-nat= yes
+PLIST.ocaml-nat= yes
. endif
.endif
# Spacetime profiling is only available for native code on 64-bit targets.
.if (${MACHINE_ARCH} == "x86_64") || (${MACHINE_ARCH} == "aarch64")
-PLIST.ocaml-spacetime= yes
+PLIST.ocaml-spacetime= yes
.endif
# clock_gettime(2), required by POSIX, is necessary for the
# instrumented_runtime feature.
# It is missing on macOS before 10.12.
.if ${OPSYS} != "Darwin" || ${OS_VERSION:R:R} >= 16
-PLIST.instrumented_runtime=yes
+PLIST.instrumented_runtime= yes
.endif
# This is needed because ${WRKSRC}/build/partial-install.sh uses
@@ -84,7 +83,7 @@
INSTALL_MAKE_FLAGS+= SHELL=${SH:Q}
.endif
-INSTALLATION_DIRS= ${PKGMANDIR}/man1
+#INSTALLATION_DIRS= ${PKGMANDIR}/man1
OPSYSVARS+= EXTRA_RT_LIBS
EXTRA_RT_LIBS.NetBSD= -lcurses
@@ -100,18 +99,12 @@
do-test:
cd ${WRKSRC}/testsuite && ${MAKE_PROGRAM} all
-post-install:
- set -e ; cd ${DESTDIR}${PREFIX}/lib/ocaml/${PKGMANDIR}/man1; \
- for m in *; do \
- ln -sf ${PREFIX}/lib/ocaml/${PKGMANDIR}/man1/$$m \
- ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/$$m; \
- done
-.if ${OPSYS} == Darwin
- set -e; cd ${DESTDIR}${PREFIX}/lib/ocaml; \
- for l in *.so */*.so; do \
- install_name_tool -id ${PREFIX}/lib/ocaml/$${l} $${l}; \
- done
-.endif
+#post-install:
+# set -e ; cd ${DESTDIR}${PREFIX}/lib/ocaml/${PKGMANDIR}/man1; \
+# for m in *; do \
+# ln -sf ${PREFIX}/lib/ocaml/${PKGMANDIR}/man1/$$m \
+# ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/$$m; \
+# done
.include "../../mk/dlopen.buildlink3.mk"
.include "../../mk/termcap.buildlink3.mk"
diff -r 8d663f0e8a7a -r a95fd8762110 lang/ocaml/Makefile.common
--- a/lang/ocaml/Makefile.common Sat Aug 24 09:01:04 2019 +0000
+++ b/lang/ocaml/Makefile.common Sat Aug 24 10:54:23 2019 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile.common,v 1.55 2018/11/12 16:09:34 jaapb Exp $
+# $NetBSD: Makefile.common,v 1.56 2019/08/24 10:54:23 jaapb Exp $
# used by x11/labltk/Makefile
-# used by x11/ocaml-graphics/Makefile
-DISTNAME= ocaml-4.07.1
+DISTNAME= ocaml-4.08.1
CATEGORIES= lang
-MASTER_SITES= http://caml.inria.fr/pub/distrib/ocaml-4.07/
+MASTER_SITES= http://caml.inria.fr/pub/distrib/ocaml-4.08/
#EXTRACT_SUFX= .tar.bz2
MAINTAINER= jaapb%NetBSD.org@localhost
@@ -12,19 +11,21 @@
COMMENT= The latest implementation of the Caml dialect of ML
LICENSE= gnu-gpl-v2
+USE_LANGUAGES+= c99
USE_TOOLS+= gmake
-HAS_CONFIGURE= yes
-CONFIGURE_ENV+= BDB_LIBS=${BDB_LINK:Q}
-CONFIGURE_ENV+= BDB_BUILTIN=${USE_BUILTIN.${BDB_TYPE}:Q}
-CONFIGURE_ARGS+= -prefix ${PREFIX}
-CONFIGURE_ARGS+= -libs ${LDFLAGS:Q}
-CONFIGURE_ARGS+= -with-pthread
-CONFIGURE_ARGS+= -host ${MACHINE_GNU_PLATFORM:Q}
-CONFIGURE_ARGS+= -mandir ${PREFIX}/lib/ocaml/${PKGMANDIR}
-CPPFLAGS+= -DDB_DBM_HSEARCH
+GNU_CONFIGURE= yes
+#CONFIGURE_ENV+= BDB_LIBS=${BDB_LINK:Q}
+#CONFIGURE_ENV+= BDB_BUILTIN=${USE_BUILTIN.${BDB_TYPE}:Q}
+#CONFIGURE_ENV+= LDFLAGS=${LDFLAGS:Q}
+#CONFIGURE_ARGS+= -prefix ${PREFIX}
+#CONFIGURE_ARGS+= -with-pthread
+#CONFIGURE_ARGS+= -host ${MACHINE_GNU_PLATFORM:Q}
+#CONFIGURE_ARGS+= -mandir ${PREFIX}/lib/ocaml/${PKGMANDIR}
+CONFIGURE_ARGS+= --without-x
+#CPPFLAGS+= -DDB_DBM_HSEARCH
-DISTINFO_FILE= ${.CURDIR}/../../lang/ocaml/distinfo
-PATCHDIR= ${.CURDIR}/../../lang/ocaml/patches
+#DISTINFO_FILE= ${.CURDIR}/../../lang/ocaml/distinfo
+#PATCHDIR= ${.CURDIR}/../../lang/ocaml/patches
.include "../../mk/bsd.prefs.mk"
@@ -32,26 +33,26 @@
INSTALL_UNSTRIPPED= yes
.endif
-.if ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+= -cc "${CC} -arch ${MACHINE_ARCH} ${CFLAGS}"
-CONFIGURE_ARGS+= -aspp "${CC} -arch ${MACHINE_ARCH} -c"
-CONFIGURE_ARGS+= -as "as -arch ${MACHINE_ARCH}"
-.else
-CONFIGURE_ARGS+= -cc "${CC} ${CFLAGS}"
-.endif
+#.if ${OPSYS} == "Darwin"
+#CONFIGURE_ENV+= CC="${CC} -arch ${MACHINE_ARCH} ${CFLAGS}"
+#CONFIGURE_ENV+= ASPP="${CC} -arch ${MACHINE_ARCH} -c"
+#CONFIGURE_ENV+= AS="as -arch ${MACHINE_ARCH}"
+#.else
+#CONFIGURE_ENV+= CC="${CC} ${CFLAGS}"
+#.endif
.include "../../mk/bdb.buildlink3.mk"
-BDB_LINK= ${BDB_LIBS}
-.if empty(BDBBASE:M/usr)
-BDB_LINK+= -L${BDBBASE}/lib ${COMPILER_RPATH_FLAG}${BDBBASE}/lib
-.endif
+#BDB_LINK= ${BDB_LIBS}
+#.if empty(BDBBASE:M/usr)
+#BDB_LINK+= -L${BDBBASE}/lib ${COMPILER_RPATH_FLAG}${BDBBASE}/lib
+#.endif
-post-extract: cp-gnu-config
+#post-extract: cp-gnu-config
-.PHONY: cp-gnu-config
-cp-gnu-config:
- ${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/config/gnu/
- ${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/config/gnu/
+#.PHONY: cp-gnu-config
+#cp-gnu-config:
+# ${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/config/gnu/
+# ${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/config/gnu/
.include "../../mk/pthread.buildlink3.mk"
diff -r 8d663f0e8a7a -r a95fd8762110 lang/ocaml/PLIST
--- a/lang/ocaml/PLIST Sat Aug 24 09:01:04 2019 +0000
+++ b/lang/ocaml/PLIST Sat Aug 24 10:54:23 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.50 2019/05/14 15:34:16 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.51 2019/08/24 10:54:23 jaapb Exp $
bin/ocaml
${PLIST.instrumented_runtime}bin/ocaml-instr-graph
${PLIST.instrumented_runtime}bin/ocaml-instr-report
@@ -54,9 +54,11 @@
lib/ocaml/bigarray.cmti
${PLIST.ocaml-opt}lib/ocaml/bigarray.cmx
${PLIST.ocaml-opt}lib/ocaml/bigarray.cmxa
-${PLIST.ocaml-opt}lib/ocaml/bigarray.cmxs
+${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/ocaml/bigarray.cmxs
lib/ocaml/bigarray.ml
lib/ocaml/bigarray.mli
+lib/ocaml/bool.ml
+lib/ocaml/bool.mli
lib/ocaml/buffer.ml
lib/ocaml/buffer.mli
lib/ocaml/bytes.ml
@@ -185,10 +187,12 @@
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/alias_analysis.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/alias_analysis.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/alias_analysis.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/alias_analysis.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/alias_analysis.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/allocated_const.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/allocated_const.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/allocated_const.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/allocated_const.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/allocated_const.mli
lib/ocaml/compiler-libs/annot.cmi
lib/ocaml/compiler-libs/annot.cmti
@@ -252,10 +256,16 @@
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/augment_specialised_args.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/augment_specialised_args.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/augment_specialised_args.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/augment_specialised_args.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/augment_specialised_args.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/backend_intf.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/backend_intf.cmti
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/backend_intf.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/backend_var.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/backend_var.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/backend_var.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/backend_var.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/backend_var.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/branch_relaxation.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/branch_relaxation.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/branch_relaxation.cmti
@@ -309,6 +319,11 @@
lib/ocaml/compiler-libs/bytesections.cmti
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/bytesections.cmx
lib/ocaml/compiler-libs/bytesections.mli
+lib/ocaml/compiler-libs/camlinternalMenhirLib.cmi
+lib/ocaml/compiler-libs/camlinternalMenhirLib.cmt
+lib/ocaml/compiler-libs/camlinternalMenhirLib.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/camlinternalMenhirLib.cmx
+lib/ocaml/compiler-libs/camlinternalMenhirLib.mli
lib/ocaml/compiler-libs/ccomp.cmi
lib/ocaml/compiler-libs/ccomp.cmt
lib/ocaml/compiler-libs/ccomp.cmti
@@ -332,18 +347,22 @@
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_conversion.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_conversion.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_conversion.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_conversion.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_conversion.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_conversion_aux.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_conversion_aux.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_conversion_aux.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_conversion_aux.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_conversion_aux.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_element.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_element.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_element.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_element.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_element.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_id.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_id.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_id.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_id.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_id.mli
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_offsets.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_offsets.cmt
@@ -353,6 +372,7 @@
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_origin.cmi
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_origin.cmt
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_origin.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_origin.cmx
${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_origin.mli
lib/ocaml/compiler-libs/cmi_format.cmi
lib/ocaml/compiler-libs/cmi_format.cmt
@@ -395,6 +415,21 @@
lib/ocaml/compiler-libs/compdynlink.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
Home |
Main Index |
Thread Index |
Old Index