From 8116e7cad77bac5d2283f2e879e6a352e39c8f63 Mon Sep 17 00:00:00 2001 From: Tobiasz Laskowski Date: Thu, 19 Dec 2024 02:03:40 +0000 Subject: [PATCH] Fix conf-libpcre2-8 for msys2 --- packages/conf-libpcre2-8/conf-libpcre2-8.2/opam | 6 ++++-- .../conf-mingw-w64-pcre2-x86_64.1/opam | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/conf-libpcre2-8/conf-libpcre2-8.2/opam b/packages/conf-libpcre2-8/conf-libpcre2-8.2/opam index 1ae040b1229..2408873b2b9 100644 --- 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 index 7071fc4e0de..c65852f703a 100644 --- 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}