Index | Thread | Search

From:
Christopher Zimmermann <chrisz@openbsd.org>
Subject:
Re: [update] dune 3.6.2 -> 3.8.3
To:
Daniel Dickman <didickman@gmail.com>
Cc:
ports@openbsd.org
Date:
Sat, 25 Oct 2025 19:37:21 +0200

Download raw body.

Thread
Hi Daniel,

the diff looks fine to me. I still would prefer a test on a non-native 
arch.
Anyone out there with time to spare and build-test this on architectures 
like powerpc, sparc64 or riscv64?
If not I guess we need to commit without test. But then it might be wise 
to go straight to 3.20 to avoid breaking stuff twice.
I'm really sorry for not being able to help out more at the moment.


Christopher


On Sat, Oct 25, 2025 at 01:12:43PM -0400, Daniel Dickman wrote:
>Hi Christopher, resending the same update for dune as I sent back in May.
>
>I now need this as I have an update for rocq to the 9.x series and that
>update has a requirement on dune 3.8.3 or later.
>
>ok to commit this? if anyone can test on non-native machines would be
>appreciated as well.
>
>Index: Makefile
>===================================================================
>RCS file: /cvs/ports/devel/dune/Makefile,v
>diff -u -p -u -r1.21 Makefile
>--- Makefile	24 Apr 2024 17:09:52 -0000	1.21
>+++ Makefile	25 Oct 2025 17:08:35 -0000
>@@ -3,9 +3,7 @@ MULTI_PACKAGES =	-main -configurator
> COMMENT-main =		OCaml build system
> COMMENT-configurator =	OCaml library for gathering system configuration
>
>-VERSION =		3.6.2
>-REVISION-main =		2
>-REVISION-configurator =	0
>+VERSION =		3.8.3
>
> CATEGORIES =		devel
>
>Index: distinfo
>===================================================================
>RCS file: /cvs/ports/devel/dune/distinfo,v
>diff -u -p -u -r1.6 distinfo
>--- distinfo	4 Apr 2023 10:27:57 -0000	1.6
>+++ distinfo	25 Oct 2025 17:08:35 -0000
>@@ -1,2 +1,2 @@
>-SHA256 (dune-3.6.2.tbz) = ttSrhI77BKoqMl0AFdMu1EFO1xMOx6oS+YFY7/RFzzw=
>-SIZE (dune-3.6.2.tbz) = 1509471
>+SHA256 (dune-3.8.3.tbz) = 4reLqAXO8yDwtZeMTTcf3oq4JUbVrlGgy0UQQhk7W/g=
>+SIZE (dune-3.8.3.tbz) = 2048982
>Index: patches/patch-Makefile
>===================================================================
>RCS file: /cvs/ports/devel/dune/patches/patch-Makefile,v
>diff -u -p -u -r1.3 patch-Makefile
>--- patches/patch-Makefile	4 Apr 2023 10:27:57 -0000	1.3
>+++ patches/patch-Makefile	25 Oct 2025 17:08:35 -0000
>@@ -2,7 +2,7 @@ Respect MAKE_JOBS during bootstrap phase
> Index: Makefile
> --- Makefile.orig
> +++ Makefile
>-@@ -47,7 +47,7 @@ release: $(BIN)
>+@@ -46,7 +46,7 @@ release: $(BIN)
>  	@$(BIN) build @install -p dune --profile dune-bootstrap
>
>  $(BIN):
>Index: pkg/PFRAG.native-configurator
>===================================================================
>RCS file: /cvs/ports/devel/dune/pkg/PFRAG.native-configurator,v
>diff -u -p -u -r1.4 PFRAG.native-configurator
>--- pkg/PFRAG.native-configurator	4 Apr 2023 10:27:57 -0000	1.4
>+++ pkg/PFRAG.native-configurator	25 Oct 2025 17:08:35 -0000
>@@ -12,6 +12,7 @@ lib/ocaml/stdune/csexp/csexp.a
> lib/ocaml/stdune/csexp/csexp.cmx
> lib/ocaml/stdune/csexp/csexp.cmxa
> lib/ocaml/stdune/csexp/csexp.cmxs
>+lib/ocaml/stdune/filesystem_stubs/dune_filesystem_stubs.a
> lib/ocaml/stdune/filesystem_stubs/dune_filesystem_stubs.cmx
> lib/ocaml/stdune/filesystem_stubs/dune_filesystem_stubs.cmxa
> lib/ocaml/stdune/filesystem_stubs/dune_filesystem_stubs.cmxs
>@@ -35,8 +36,11 @@ lib/ocaml/stdune/stdune__Code_error.cmx
> lib/ocaml/stdune/stdune__Comparable.cmx
> lib/ocaml/stdune/stdune__Comparable_intf.cmx
> lib/ocaml/stdune/stdune__Comparator.cmx
>+lib/ocaml/stdune/stdune__Dev_null.cmx
>+lib/ocaml/stdune/stdune__Dune_either.cmx
> lib/ocaml/stdune/stdune__Either.cmx
> lib/ocaml/stdune/stdune__Env.cmx
>+lib/ocaml/stdune/stdune__Env_path.cmx
> lib/ocaml/stdune/stdune__Escape.cmx
> lib/ocaml/stdune/stdune__Exn.cmx
> lib/ocaml/stdune/stdune__Exn_with_backtrace.cmx
>@@ -68,6 +72,7 @@ lib/ocaml/stdune/stdune__Or_exn.cmx
> lib/ocaml/stdune/stdune__Path.cmx
> lib/ocaml/stdune/stdune__Path_intf.cmx
> lib/ocaml/stdune/stdune__Pid.cmx
>+lib/ocaml/stdune/stdune__Platform.cmx
> lib/ocaml/stdune/stdune__Poly.cmx
> lib/ocaml/stdune/stdune__Predicate.cmx
> lib/ocaml/stdune/stdune__Proc.cmx
>Index: pkg/PLIST-configurator
>===================================================================
>RCS file: /cvs/ports/devel/dune/pkg/PLIST-configurator,v
>diff -u -p -u -r1.4 PLIST-configurator
>--- pkg/PLIST-configurator	4 Apr 2023 10:27:57 -0000	1.4
>+++ pkg/PLIST-configurator	25 Oct 2025 17:08:35 -0000
>@@ -70,11 +70,16 @@ lib/ocaml/stdune/csexp/csexp.cmt
> lib/ocaml/stdune/csexp/csexp.cmti
> lib/ocaml/stdune/csexp/csexp.ml
> lib/ocaml/stdune/csexp/csexp.mli
>+lib/ocaml/stdune/dev_null.ml
>+lib/ocaml/stdune/dev_null.mli
> lib/ocaml/stdune/dune-package
>+lib/ocaml/stdune/dune_either.ml
> lib/ocaml/stdune/either.ml
> lib/ocaml/stdune/either.mli
> lib/ocaml/stdune/env.ml
> lib/ocaml/stdune/env.mli
>+lib/ocaml/stdune/env_path.ml
>+lib/ocaml/stdune/env_path.mli
> lib/ocaml/stdune/escape.ml
> lib/ocaml/stdune/escape.mli
> lib/ocaml/stdune/exn.ml
>@@ -139,6 +144,8 @@ lib/ocaml/stdune/path.mli
> lib/ocaml/stdune/path_intf.ml
> lib/ocaml/stdune/pid.ml
> lib/ocaml/stdune/pid.mli
>+lib/ocaml/stdune/platform.ml
>+lib/ocaml/stdune/platform.mli
> lib/ocaml/stdune/poly.ml
> lib/ocaml/stdune/poly.mli
> lib/ocaml/stdune/predicate.ml
>@@ -213,12 +220,20 @@ lib/ocaml/stdune/stdune__Comparable_intf
> lib/ocaml/stdune/stdune__Comparator.cmi
> lib/ocaml/stdune/stdune__Comparator.cmt
> lib/ocaml/stdune/stdune__Comparator.cmti
>+lib/ocaml/stdune/stdune__Dev_null.cmi
>+lib/ocaml/stdune/stdune__Dev_null.cmt
>+lib/ocaml/stdune/stdune__Dev_null.cmti
>+lib/ocaml/stdune/stdune__Dune_either.cmi
>+lib/ocaml/stdune/stdune__Dune_either.cmt
> lib/ocaml/stdune/stdune__Either.cmi
> lib/ocaml/stdune/stdune__Either.cmt
> lib/ocaml/stdune/stdune__Either.cmti
> lib/ocaml/stdune/stdune__Env.cmi
> lib/ocaml/stdune/stdune__Env.cmt
> lib/ocaml/stdune/stdune__Env.cmti
>+lib/ocaml/stdune/stdune__Env_path.cmi
>+lib/ocaml/stdune/stdune__Env_path.cmt
>+lib/ocaml/stdune/stdune__Env_path.cmti
> lib/ocaml/stdune/stdune__Escape.cmi
> lib/ocaml/stdune/stdune__Escape.cmt
> lib/ocaml/stdune/stdune__Escape.cmti
>@@ -304,6 +319,9 @@ lib/ocaml/stdune/stdune__Path_intf.cmt
> lib/ocaml/stdune/stdune__Pid.cmi
> lib/ocaml/stdune/stdune__Pid.cmt
> lib/ocaml/stdune/stdune__Pid.cmti
>+lib/ocaml/stdune/stdune__Platform.cmi
>+lib/ocaml/stdune/stdune__Platform.cmt
>+lib/ocaml/stdune/stdune__Platform.cmti
> lib/ocaml/stdune/stdune__Poly.cmi
> lib/ocaml/stdune/stdune__Poly.cmt
> lib/ocaml/stdune/stdune__Poly.cmti
>@@ -417,6 +435,8 @@ share/doc/dune-configurator/
> share/doc/dune-configurator/CHANGES.md
> share/doc/dune-configurator/LICENSE.md
> share/doc/dune-configurator/README.md
>+share/doc/dune-configurator/odoc-pages/
>+share/doc/dune-configurator/odoc-pages/index.mld
> share/doc/stdune/
> share/doc/stdune/CHANGES.md
> share/doc/stdune/LICENSE.md
>Index: pkg/PLIST-main
>===================================================================
>RCS file: /cvs/ports/devel/dune/pkg/PLIST-main,v
>diff -u -p -u -r1.3 PLIST-main
>--- pkg/PLIST-main	4 Apr 2023 10:27:57 -0000	1.3
>+++ pkg/PLIST-main	25 Oct 2025 17:08:35 -0000
>@@ -45,6 +45,8 @@ share/doc/dune/
> share/doc/dune/CHANGES.md
> share/doc/dune/LICENSE.md
> share/doc/dune/README.md
>+share/doc/dune/odoc-pages/
>+share/doc/dune/odoc-pages/index.mld
> share/emacs/
> share/emacs/site-lisp/
> share/emacs/site-lisp/dune-flymake.el
>

-- 
OpenPGP: http://gmerlin.de/christopher.pub
CB07 DA40 B0B6 571D 35E2  0DEF 87E2 92A7 13E5 DEE1