Merge pull request #27146 from tobil4sk/libpcre2-msys

Fix conf-libpcre2-8 for msys2
ocaml · Dec 19, 2024 · 0a7f1be · 0a7f1be
2 parents d40f31a + 8116e7c
commit 0a7f1be
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/packages/conf-libpcre2-8/conf-libpcre2-8.2/opam b/packages/conf-libpcre2-8/conf-libpcre2-8.2/opam
@@ -16,8 +16,10 @@ build: [
   ]]
 depends: [
   "conf-pkg-config" {build}
-  ("host-arch-x86_32" {os = "win32" & os-distribution = "cygwin"} & "conf-mingw-w64-pcre2-i686" {os = "win32" & os-distribution = "cygwin"} |
-   "host-arch-x86_64" {os = "win32" & os-distribution = "cygwin"} & "conf-mingw-w64-pcre2-x86_64" {os = "win32" & os-distribution = "cygwin"})
+  ("host-arch-x86_32" {os = "win32" & (os-distribution = "cygwin" | os-distribution = "msys2")}
+   & "conf-mingw-w64-pcre2-i686" {os = "win32" & (os-distribution = "cygwin" | os-distribution = "msys2")}
+   | "host-arch-x86_64" {os = "win32" & (os-distribution = "cygwin" | os-distribution = "msys2")}
+   & "conf-mingw-w64-pcre2-x86_64" {os = "win32" & (os-distribution = "cygwin" | os-distribution = "msys2")})
   ]
 bug-reports: "https://github.com/ocaml/opam-repository/issues"
 depexts: [

diff --git a/packages/conf-mingw-w64-pcre2-x86_64/conf-mingw-w64-pcre2-x86_64.1/opam b/packages/conf-mingw-w64-pcre2-x86_64/conf-mingw-w64-pcre2-x86_64.1/opam
@@ -10,7 +10,7 @@ license: "BSD-3-Clause"
 homepage: "https://www.pcre.org/"
 bug-reports: "https://github.com/ocaml/opam-repository/issues"
 flags: conf
-available: os = "win32" & os-distribution = "cygwin"
+available: os = "win32"
 build: ["pkgconf" "--personality=x86_64-w64-mingw32" "libpcre2-8"]
 depends: [
   "conf-pkg-config" {build}