From 5aff7bdc6e137252ccfe52dae1d7337b052e6a36 Mon Sep 17 00:00:00 2001 From: David Allsopp Date: Fri, 21 Jun 2024 14:50:03 +0100 Subject: [PATCH 1/3] Sync opam-core with opam-repository (no-op) --- opam-core.opam | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/opam-core.opam b/opam-core.opam index 2e11d11fecd..979c5398b11 100644 --- a/opam-core.opam +++ b/opam-core.opam @@ -1,9 +1,8 @@ opam-version: "2.0" version: "2.2.0~rc1" synopsis: "Core library for opam 2.2" -description: """ -Small standard library extensions, and generic system interaction modules used by opam. -""" +description: + "Small standard library extensions, and generic system interaction modules used by opam." maintainer: "opam-devel@lists.ocaml.org" authors: [ "David Allsopp " @@ -19,14 +18,9 @@ authors: [ "Ralf Treinen " "Frederic Tuong " ] +license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception" homepage: "https://opam.ocaml.org" bug-reports: "https://github.com/ocaml/opam/issues" -dev-repo: "git+https://github.com/ocaml/opam.git" -license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception" -build: [ - ["./configure" "--disable-checks" "--prefix" prefix] - ["dune" "build" "-p" name "-j" jobs] -] depends: [ "ocaml" {>= "4.08.0"} "base-unix" @@ -38,4 +32,9 @@ depends: [ "swhid_core" "uutf" ] -conflicts: "extlib-compat" +conflicts: ["extlib-compat"] +build: [ + ["./configure" "--disable-checks" "--prefix" prefix] + ["dune" "build" "-p" name "-j" jobs] +] +dev-repo: "git+https://github.com/ocaml/opam.git" From bc7e22a780b0de8d3be5b98d40b5d79b417737c9 Mon Sep 17 00:00:00 2001 From: David Allsopp Date: Fri, 21 Jun 2024 14:50:24 +0100 Subject: [PATCH 2/3] Windows needs both C compilers --- master_changes.md | 1 + opam-core.opam | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/master_changes.md b/master_changes.md index 1ab70ae3e4a..ac569e38cd7 100644 --- a/master_changes.md +++ b/master_changes.md @@ -67,6 +67,7 @@ users) ## VCS ## Build + * Synchronise opam-core.opam with opam-repository changes [#6043 @dra27] ## Infrastructure diff --git a/opam-core.opam b/opam-core.opam index 979c5398b11..82b62d47ce7 100644 --- a/opam-core.opam +++ b/opam-core.opam @@ -31,6 +31,12 @@ depends: [ "jsonm" "swhid_core" "uutf" + (("host-system-mingw" {os = "win32" & os-distribution != "cygwinports"} & + "conf-mingw-w64-gcc-i686" {os = "win32" & os-distribution != "cygwinports"} & + "conf-mingw-w64-gcc-x86_64" {os = "win32" & os-distribution != "cygwinports"}) | + ("host-system-msvc" {os = "win32" & os-distribution != "cygwinports"} & + "conf-msvc32" {os = "win32" & os-distribution != "cygwinports"} & + "conf-msvc64" {os = "win32" & os-distribution != "cygwinports"})) ] conflicts: ["extlib-compat"] build: [ From 44fc1754528806c91d61d3a79747fff0798a3dd4 Mon Sep 17 00:00:00 2001 From: David Allsopp Date: Fri, 21 Jun 2024 14:53:21 +0100 Subject: [PATCH 3/3] OCaml 5.x not supported on Windows (yet) --- opam-core.opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opam-core.opam b/opam-core.opam index 82b62d47ce7..80eb1423122 100644 --- a/opam-core.opam +++ b/opam-core.opam @@ -22,7 +22,7 @@ license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception" homepage: "https://opam.ocaml.org" bug-reports: "https://github.com/ocaml/opam/issues" depends: [ - "ocaml" {>= "4.08.0"} + "ocaml" {>= "4.08.0" & (os != "win32" | < "5.0")} "base-unix" "ocamlgraph" "re" {>= "1.9.0"}