From 2237cacd7ad7c6f80d5afa891481795738578b3c Mon Sep 17 00:00:00 2001 From: Kate Date: Wed, 30 Oct 2024 18:11:04 +0000 Subject: [PATCH] Bump to dune 3.16.1 --- src_ext/Makefile.dune | 4 ++-- src_ext/patches/mccs/ocaml-5.3.patch | 12 ------------ 2 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 src_ext/patches/mccs/ocaml-5.3.patch diff --git a/src_ext/Makefile.dune b/src_ext/Makefile.dune index e8560ef1ee2..eeb3c9d9414 100644 --- a/src_ext/Makefile.dune +++ b/src_ext/Makefile.dune @@ -1,3 +1,3 @@ # NB If minimum OCaml version for Dune changes, update DUNE_SECONDARY in configure.ac -URL_dune-local = https://github.com/ocaml/dune/releases/download/3.16.0/dune-3.16.0.tbz -MD5_dune-local = 4605a1d9783a96a16cbec381cfbb3ac1 +URL_dune-local = https://github.com/ocaml/dune/releases/download/3.16.1/dune-3.16.1.tbz +MD5_dune-local = c19a1bb71eb3510ca15ddcf9f875947a diff --git a/src_ext/patches/mccs/ocaml-5.3.patch b/src_ext/patches/mccs/ocaml-5.3.patch deleted file mode 100644 index e3efc395d63..00000000000 --- a/src_ext/patches/mccs/ocaml-5.3.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur a/src/context_flags.ml b/src/context_flags.ml ---- a/src/context_flags.ml 2024-08-21 13:03:37.000000000 +0000 -+++ b/src/context_flags.ml 2024-09-05 14:57:29.242019552 +0000 -@@ -23,7 +23,7 @@ - let flags = - (if (Sys.win32 && Config.ccomp_type = "msvc") - then ["\"/EHsc\""] -- else ["-Wall -Wextra -Wno-unused-parameter -x c++"]) @ -+ else ["-Wall -Wextra -Wno-unused-parameter -x c++ -std=gnu++11"]) @ - (ifc useGLPK ["-DUSEGLPK"]) @ - (ifc useCOIN ["-DUSECOIN"]) @ - (ifc useCLP ["-DUSECLP"]) @