From cb2d86e71371b41a24c57d19807e4f67c6dc7e0f Mon Sep 17 00:00:00 2001
From: Virgile Prevosto <virgile.prevosto@m4x.org>
Date: Mon, 29 Jul 2024 17:05:32 +0200
Subject: [PATCH] [dune] use a dune version where we can have menhir's
conflicts files
---
dune | 2 --
dune-project | 4 ++--
opam | 9 ++-------
src/kernel_internals/parsing/dune | 4 ++--
4 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/dune b/dune
index e0508336539..72ae34f610a 100644
--- a/dune
+++ b/dune
@@ -20,8 +20,6 @@
;; ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(env
- (trace-menhir (menhir_flags --trace)))
(alias (name default) (deps (alias install)))
(dirs bin headers man share src tools tests)
diff --git a/dune-project b/dune-project
index 5e9fd2575ee..3753ddb00b5 100644
--- a/dune-project
+++ b/dune-project
@@ -1,4 +1,4 @@
-(lang dune 3.7)
+(lang dune 3.13)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; ;;
;; This file is part of Frama-C. ;;
@@ -21,6 +21,6 @@
;; ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(using menhir 2.1)
+(using menhir 3.0)
(using dune_site 0.1)
(package (name frama-c) (sites (share share) (libexec lib) (lib plugins) (lib plugins_gui)))
diff --git a/opam b/opam
index 60109c91632..c1145cbfe92 100644
--- a/opam
+++ b/opam
@@ -122,14 +122,9 @@ run-test: [
]
depends: [
- "dune" { >= "3.7.0"
- & != "3.13.0" # performance problem
- }
+ "dune" { > "3.13.0" }
"dune-configurator"
- "dune-site" { >= "3.7.0"
- & != "3.13.0" # performance problem
- }
-
+ "dune-site" { > "3.13.0" }
( "alt-ergo-free" | "alt-ergo" )
"conf-graphviz" { post }
"conf-time" { with-test }
diff --git a/src/kernel_internals/parsing/dune b/src/kernel_internals/parsing/dune
index 121f1903b0c..bd740a0e899 100644
--- a/src/kernel_internals/parsing/dune
+++ b/src/kernel_internals/parsing/dune
@@ -27,11 +27,11 @@
(menhir
(modules logic_parser)
; "--fixed-exception" fixes compatibility with ocamlyacc Parsing.Parse_error
- (flags :standard --fixed-exception --explain --dump --comment)
+ (flags :standard --fixed-exception --dump --comment)
)
(menhir
(modules cparser)
; "--fixed-exception" fixes compatibility with ocamlyacc Parsing.Parse_error
- (flags --fixed-exception --explain --dump --comment)
+ (flags --fixed-exception --dump --comment)
)
--
GitLab