Skip to content

Commit 7637cad

Browse files
authored
Merge pull request #6225 from kit-ty-kate/2.3-ocaml-5.3
[2.3 backport] Update the vendored dependencies and unlock OCaml 5.3 compatibility
2 parents 0eec18e + 7717ef1 commit 7637cad

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

master_changes.md

+2
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ users)
7272

7373
## Build
7474
* Bump the requirement for dune to 2.8 [#6204 @kit-ty-kate]
75+
* Bump the vendored version of dune to 3.16.0, cppo to 1.7.0 and extlib to 1.8.0 [#6223 @kit-ty-kate]
76+
* Fix compilation with OCaml 5.3 when using the vendored extlib by updating to the 5.3 compatible version (e.g. `make cold` or `./configure --with-vendored-deps`) [#6223 @kit-ty-kate]
7577

7678
## Infrastructure
7779

src_ext/Makefile.dune

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# NB If minimum OCaml version for Dune changes, update DUNE_SECONDARY in configure.ac
2-
URL_dune-local = https://github.com/ocaml/dune/releases/download/3.14.2/dune-3.14.2.tbz
3-
MD5_dune-local = 9496e02635c05a8288781b55fb837b6f
2+
URL_dune-local = https://github.com/ocaml/dune/releases/download/3.16.0/dune-3.16.0.tbz
3+
MD5_dune-local = 4605a1d9783a96a16cbec381cfbb3ac1

src_ext/Makefile.sources

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
URL_cppo = https://github.com/ocaml-community/cppo/archive/v1.6.9.tar.gz
2-
MD5_cppo = d23ffe85ac7dc8f0afd1ddf622770d09
1+
URL_cppo = https://github.com/ocaml-community/cppo/archive/refs/tags/v1.7.0.tar.gz
2+
MD5_cppo = 90f66810f73b115cc55e581a34bf7db9
33

4-
URL_extlib = https://github.com/ygrek/ocaml-extlib/releases/download/1.7.9/extlib-1.7.9.tar.gz
5-
MD5_extlib = f7ca7f1c82e15a99603b88f730fd7b8a
4+
URL_extlib = https://github.com/ygrek/ocaml-extlib/releases/download/1.8.0/extlib-1.8.0.tar.gz
5+
MD5_extlib = 43fb3bf2989671af1769147b1171d080
66

77
URL_base64 = https://github.com/mirage/ocaml-base64/releases/download/v3.5.1/base64-3.5.1.tbz
88
MD5_base64 = bfdd16aa8c136412878109df8791fc01

tests/reftests/repository.test

+1-1
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,7 @@ opam-version: "5.0"
689689
GARBAGE
690690
### <VRS/packages/a/a.1/opam>
691691
opam-version: "2.0"
692-
### opam update -a --debug-level=-1
692+
### opam update -a --debug-level=-1 | unordered
693693

694694
<><> Updating package repositories ><><><><><><><><><><><><><><><><><><><><><><>
695695
[repo] synchronised from file://${BASEDIR}/REPO

0 commit comments

Comments
 (0)