aboutsummaryrefslogtreecommitdiff
path: root/coq.opam
diff options
context:
space:
mode:
authorEmilio Jesus Gallego Arias2020-06-22 17:52:18 +0200
committerEmilio Jesus Gallego Arias2021-03-03 16:06:14 +0100
commitab98d847d237af3cd0e46edef42218be65cfc98f (patch)
tree91d26077257724e2eeefe1bf39e24f24d34070be /coq.opam
parentef22a5aaf1728d840341d31befd67dd90c5b2e0e (diff)
[build] Split stdlib to it's own opam package.
We introduce a new package structure for Coq: - `coq-core`: Coq's OCaml tools code and plugins - `coq-stdlib`: Coq's stdlib [.vo files] - `coq`: meta-package that pulls `coq-{core,stdlib}` This has several advantages, in particular it allows to install Coq without the stdlib which is useful in several scenarios, it also open the door towards a versioning of the stdlib at the package level. The main user-visible change is that Coq's ML development files now live in `$lib/coq-core`, for compatibility in the regular build we install a symlink and support both setups for a while. Note that plugin developers and even `coq_makefile` should actually rely on `ocamlfind` to locate Coq's OCaml libs as to be more robust. There is a transient state where we actually look for both `$coqlib/plugins` and `$coqlib/../coq-core/plugins` as to support the non-ocamlfind plus custom variables. This will be much improved once #13617 is merged (which requires this PR first), then, we will introduce a `coq.boot` library so finally `coqdep`, `coqchk`, etc... can share the same path setup code. IMHO the plan should work fine.
Diffstat (limited to 'coq.opam')
-rw-r--r--coq.opam14
1 files changed, 4 insertions, 10 deletions
diff --git a/coq.opam b/coq.opam
index 88e81abf46..3bc3d4db74 100644
--- a/coq.opam
+++ b/coq.opam
@@ -20,15 +20,12 @@ homepage: "https://coq.inria.fr/"
doc: "https://coq.github.io/doc/"
bug-reports: "https://github.com/coq/coq/issues"
depends: [
- "ocaml" {>= "4.05.0"}
- "dune" {>= "2.5.0"}
- "ocamlfind" {>= "1.8.1"}
- "zarith" {>= "1.10"}
- "ounit2" {with-test}
+ "dune" {>= "2.5"}
+ "coq-core" {= version}
+ "coq-stdlib" {= version}
]
build: [
-# Disabled until Dune 2.8 is available
-# ["dune" "subst"] {pinned}
+ ["dune" "subst"] {pinned}
[
"dune"
"build"
@@ -42,6 +39,3 @@ build: [
]
]
dev-repo: "git+https://github.com/coq/coq.git"
-build-env: [
- [ COQ_CONFIGURE_PREFIX = "%{prefix}" ]
-]