ocaml: update to 5.3.0

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: ocaml: update to 5.3.0
From: Thomas Klausner (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Thu, 28 Aug 2025 22:13:25 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Fri Aug 29 00:12:52 2025 +0200
Changeset:	fa89544cc3f80e98e48bd9301df7d5a1e3db28d6

Modified Files:
	ocaml/Makefile
	ocaml/Makefile.common
	ocaml/PLIST
	ocaml/buildlink3.mk
	ocaml/distinfo
	ocaml/native.mk

Log Message:
ocaml: update to 5.3.0

TODO:
disable native compiler since it breaks the build;
this, however, does work when compiling outside of pkgsrc,
should be investigated and fixed

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=fa89544cc3f80e98e48bd9301df7d5a1e3db28d6

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 ocaml/Makefile        |  9 ---------
 ocaml/Makefile.common |  3 +--
 ocaml/PLIST           | 34 ++++++++++++++++++++++++++++++++++
 ocaml/buildlink3.mk   |  2 +-
 ocaml/distinfo        |  6 +++---
 ocaml/native.mk       | 10 +++++++++-
 6 files changed, 48 insertions(+), 16 deletions(-)

diffs:
diff --git a/ocaml/Makefile b/ocaml/Makefile
index a26281fdaf..2a9aebb344 100644
--- a/ocaml/Makefile
+++ b/ocaml/Makefile
@@ -8,19 +8,10 @@ UNLIMIT_RESOURCES=	stacksize
 USE_TOOLS+=		bash
 USE_LANGUAGES+=		c
 USE_LIBTOOL=		yes
-USE_GNU_CONFIGURE_HOST=	no
 
 .include "options.mk"
 .include "native.mk"
 
-.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
-
 # configure: error: fma does not work, enable emulation with --enable-imprecise-c99-float-ops
 .if ${MACHINE_PLATFORM:MNetBSD-*-i386} || \
     ${MACHINE_PLATFORM:MNetBSD-*-earm*}
diff --git a/ocaml/Makefile.common b/ocaml/Makefile.common
index 529447dc51..43f8909261 100644
--- a/ocaml/Makefile.common
+++ b/ocaml/Makefile.common
@@ -5,7 +5,7 @@
 # Please do not update to ocaml 5.x without discussion, as the
 # consensus is mostly that those versions are not yet baked, and will
 # cause hard-to-debug problems.
-DISTNAME=	ocaml-5.2.1
+DISTNAME=	ocaml-5.3.0
 CATEGORIES=	lang
 # unreliable
 #MASTER_SITES=	https://caml.inria.fr/pub/distrib/ocaml-5.2/
@@ -36,6 +36,5 @@ MKPIE_SUPPORTED=	no
 INSTALL_UNSTRIPPED=	yes
 .endif
 
-.include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../archivers/zstd/buildlink3.mk"
diff --git a/ocaml/PLIST b/ocaml/PLIST
index 1ab8fe641a..282279a080 100644
--- a/ocaml/PLIST
+++ b/ocaml/PLIST
@@ -52,6 +52,7 @@ lib/ocaml/callback.mli
 lib/ocaml/caml/address_class.h
 lib/ocaml/caml/addrmap.h
 lib/ocaml/caml/alloc.h
+lib/ocaml/caml/asm.h
 lib/ocaml/caml/atomic_refcount.h
 lib/ocaml/caml/backtrace.h
 lib/ocaml/caml/backtrace_prim.h
@@ -61,6 +62,7 @@ lib/ocaml/caml/callback.h
 lib/ocaml/caml/camlatomic.h
 lib/ocaml/caml/codefrag.h
 lib/ocaml/caml/compare.h
+lib/ocaml/caml/compatibility.h
 lib/ocaml/caml/config.h
 lib/ocaml/caml/custom.h
 lib/ocaml/caml/debugger.h
@@ -233,6 +235,7 @@ lib/ocaml/compiler-libs/ast_mapper.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ast_mapper.cmx
 lib/ocaml/compiler-libs/ast_mapper.mli
 lib/ocaml/compiler-libs/asttypes.cmi
+lib/ocaml/compiler-libs/asttypes.cmt
 lib/ocaml/compiler-libs/asttypes.cmti
 lib/ocaml/compiler-libs/asttypes.mli
 lib/ocaml/compiler-libs/attr_helper.cmi
@@ -591,6 +594,10 @@ 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
+lib/ocaml/compiler-libs/errortrace_report.cmi
+lib/ocaml/compiler-libs/errortrace_report.cmt
+lib/ocaml/compiler-libs/errortrace_report.cmti
+lib/ocaml/compiler-libs/errortrace_report.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
@@ -650,6 +657,10 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_utils.cmt
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_utils.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_utils.cmx
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_utils.mli
+lib/ocaml/compiler-libs/format_doc.cmi
+lib/ocaml/compiler-libs/format_doc.cmt
+lib/ocaml/compiler-libs/format_doc.cmti
+lib/ocaml/compiler-libs/format_doc.mli
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/freshening.cmi
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/freshening.cmt
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/freshening.cmti
@@ -660,6 +671,10 @@ 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
+lib/ocaml/compiler-libs/gprinttyp.cmi
+lib/ocaml/compiler-libs/gprinttyp.cmt
+lib/ocaml/compiler-libs/gprinttyp.cmti
+lib/ocaml/compiler-libs/gprinttyp.mli
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/id_types.cmi
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/id_types.cmt
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/id_types.cmti
@@ -828,6 +843,10 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linkage_name.cmt
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linkage_name.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linkage_name.cmx
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linkage_name.mli
+lib/ocaml/compiler-libs/linkdeps.cmi
+lib/ocaml/compiler-libs/linkdeps.cmt
+lib/ocaml/compiler-libs/linkdeps.cmti
+lib/ocaml/compiler-libs/linkdeps.mli
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linscan.cmi
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linscan.cmt
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linscan.cmti
@@ -962,6 +981,10 @@ ${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/out_type.cmi
+lib/ocaml/compiler-libs/out_type.cmt
+lib/ocaml/compiler-libs/out_type.cmti
+lib/ocaml/compiler-libs/out_type.mli
 lib/ocaml/compiler-libs/outcometree.cmi
 lib/ocaml/compiler-libs/outcometree.cmti
 lib/ocaml/compiler-libs/outcometree.mli
@@ -1103,6 +1126,10 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/projection.cmt
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/projection.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/projection.cmx
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/projection.mli
+lib/ocaml/compiler-libs/rawprinttyp.cmi
+lib/ocaml/compiler-libs/rawprinttyp.cmt
+lib/ocaml/compiler-libs/rawprinttyp.cmti
+lib/ocaml/compiler-libs/rawprinttyp.mli
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ref_to_variables.cmi
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ref_to_variables.cmt
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ref_to_variables.cmti
@@ -2238,6 +2265,7 @@ man/man3/CamlinternalMenhirLib.Engine.Make.3
 man/man3/CamlinternalMenhirLib.EngineTypes.3
 man/man3/CamlinternalMenhirLib.EngineTypes.ENGINE.3
 man/man3/CamlinternalMenhirLib.EngineTypes.INCREMENTAL_ENGINE_START.3
+man/man3/CamlinternalMenhirLib.EngineTypes.LOG.3
 man/man3/CamlinternalMenhirLib.EngineTypes.MONOLITHIC_ENGINE.3
 man/man3/CamlinternalMenhirLib.EngineTypes.TABLE.3
 man/man3/CamlinternalMenhirLib.EngineTypes.TABLE.Log.3
@@ -2334,6 +2362,8 @@ man/man3/Float.3
 man/man3/Float.Array.3
 man/man3/Float.ArrayLabels.3
 man/man3/Format.3
+man/man3/Format_doc.3
+man/man3/Format_doc.Doc.3
 man/man3/Format_tutorial.3
 man/man3/Fun.3
 man/man3/Gc.3
@@ -2369,12 +2399,14 @@ man/man3/Lazy.3
 man/man3/Lazy_backtrack.3
 man/man3/Lexer.3
 man/man3/Lexing.3
+man/man3/Linkdeps.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/Location.Doc.3
 man/man3/Longident.3
 man/man3/Map.3
 man/man3/Map.Make.3
@@ -2395,6 +2427,7 @@ man/man3/Misc.Stdlib.String.Map.3
 man/man3/Misc.Stdlib.String.Set.3
 man/man3/Misc.Stdlib.String.Tbl.3
 man/man3/Misc.Style.3
+man/man3/Misc.Utf8_lexeme.3
 man/man3/MoreLabels.3
 man/man3/MoreLabels.Hashtbl.3
 man/man3/MoreLabels.Hashtbl.HashedType.3
@@ -2433,6 +2466,7 @@ man/man3/Parsetree.3
 man/man3/Parsing.3
 man/man3/Pparse.3
 man/man3/Pprintast.3
+man/man3/Pprintast.Doc.3
 man/man3/Printast.3
 man/man3/Printexc.3
 man/man3/Printexc.Slot.3
diff --git a/ocaml/buildlink3.mk b/ocaml/buildlink3.mk
index bbc66f25ca..9f8dd0d900 100644
--- a/ocaml/buildlink3.mk
+++ b/ocaml/buildlink3.mk
@@ -8,7 +8,7 @@ OCAML_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml+=	ocaml>=4.14.0
 BUILDLINK_ABI_DEPENDS.ocaml+=	ocaml>=4.14.0
-BUILDLINK_PKGSRCDIR.ocaml?=	../../lang/ocaml
+BUILDLINK_PKGSRCDIR.ocaml?=	../../wip/ocaml
 #BUILDLINK_DEPMETHOD.ocaml?=	build
 
 BUILDLINK_PASSTHRU_DIRS+=	${BUILDLINK_PREFIX.ocaml}/lib/ocaml
diff --git a/ocaml/distinfo b/ocaml/distinfo
index a2e9480e51..e23a26a39f 100644
--- a/ocaml/distinfo
+++ b/ocaml/distinfo
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.146 2023/04/09 07:27:48 wiz Exp $
 
-BLAKE2s (ocaml-5.2.1.tar.gz) = d223cd79b517183cfce727e3ce856b9620e6c72331179e98eeb60ebbce161571
-SHA512 (ocaml-5.2.1.tar.gz) = b0803dd90a0ac6fdf609345c481b3dc637eb9cbb9bea296cfd79f6913ab34b9e02970bcddd83e8bc419cbe1c4694bb7889146615841b5ee101081a82eee024e2
-Size (ocaml-5.2.1.tar.gz) = 6051609 bytes
+BLAKE2s (ocaml-5.3.0.tar.gz) = 2687ec1d15df7b768a0b3f318337ee84caa8dec2b30d6dbde61f05b465d26a24
+SHA512 (ocaml-5.3.0.tar.gz) = 73817ada340bdf4091b3edd7b292bd0074c87b4836f202f48ecf0f620a00feaa70ebc9101b97155e8caa6907646dfdf21eff728fa0e14542df3b5e5436229d06
+Size (ocaml-5.3.0.tar.gz) = 6239856 bytes
diff --git a/ocaml/native.mk b/ocaml/native.mk
index 5c6ccb8b5e..5d3ad80ec2 100644
--- a/ocaml/native.mk
+++ b/ocaml/native.mk
@@ -35,13 +35,21 @@ OCAML_USE_OPT_COMPILER?=	no
 # Things that get installed with the opt compiler
 PLIST_VARS+=	ocaml-opt
 
-.if ${OCAML_USE_OPT_COMPILER} == "yes"
+# works when building outside of pkgsrc, breaks
+# when building inside
+# https://github.com/ocaml/ocaml/issues/14207#issuecomment-3228396849
+
+.if ${OCAML_USE_OPT_COMPILER} == "yesTODOBROKEN"
 # The opt compiler needs the C compiler suite
 USE_LANGUAGES+=		c
 PLIST.ocaml-opt=	yes
+CONFIGURE_ARGS+=	--enable-native-compiler
+BUILD_TARGET=		world.opt
 .else
 # If we're bytecode compiling, don't strip executables
 INSTALL_UNSTRIPPED=	yes
+CONFIGURE_ARGS+=	--disable-native-compiler
+BUILD_TARGET=		world
 .endif
 
 .endif # OCAML_NATIVE_MK
Prev by Date: ocaml: remove unused EXTRA_RT_LIBS
Next by Date: ocaml: update TODO
Previous by Thread: ocaml: remove unused EXTRA_RT_LIBS
Next by Thread: ocaml: update TODO
Indexes:
Home | Main Index | Thread Index | Old Index