Query with 'pkg-config' on MSys2 for 'freeglut' - also in conf-mingw-w64-freeglut-* subpackages

Author: jmid

packages/conf-freeglut/conf-freeglut.1/opam

@@ -5,7 +5,8 @@ homepage: "https://freeglut.sourceforge.net/"
 license: "X11"
 bug-reports: "https://github.com/ocaml/opam-repository/issues"
 build: [
-  ["pkg-config" "--print-errors" "--exists" "glut"] {(os != "win32" | os-distribution != "cygwin") & os-distribution != "debian" & os-distribution != "ubuntu" & !(os-distribution = "ol" & os-version < "9")}
+  ["pkg-config" "--print-errors" "--exists" "freeglut"] {os = "win32" & os-distribution = "msys"}
+  ["pkg-config" "--print-errors" "--exists" "glut"] {os != "win32" & os-distribution != "debian" & os-distribution != "ubuntu" & !(os-distribution = "ol" & os-version < "9")}
 ]
 depends: [
   "conf-pkg-config" {build & os-distribution != "debian" & os-distribution != "ubuntu" & !(os-distribution = "ol" & os-version < "9")}

packages/conf-mingw-w64-freeglut-i686/conf-mingw-w64-freeglut-i686.1/opam

@@ -8,7 +8,10 @@ homepage: "https://freeglut.sourceforge.net/"
 bug-reports: "https://github.com/ocaml/opam-repository/issues"
 flags: conf
 available: os = "win32"
-build: ["pkgconf" "--personality=i686-w64-mingw32" "freeglut"]
+build: [
+  # Cygwin is missing a pkg-config .pc file https://cygwin.com/packages/x86_64/mingw64-i686-freeglut/mingw64-i686-freeglut-2.8.1-1
+  ["pkg-config" "--personality=i686-w64-mingw32" "freeglut"] {os = "win32" & os-distribution = "msys2"}
+]
 depends: [
   "conf-pkg-config" {build}
   "conf-mingw-w64-gcc-i686" {build}

packages/conf-mingw-w64-freeglut-x86_64/conf-mingw-w64-freeglut-x86_64.1/opam

@@ -8,7 +8,10 @@ homepage: "https://freeglut.sourceforge.net/"
 bug-reports: "https://github.com/ocaml/opam-repository/issues"
 flags: conf
 available: os = "win32"
-build: ["pkgconf" "--personality=x86_64-w64-mingw32" "freeglut"]
+build: [
+  # Cygwin is missing a pkg-config .pc file https://www.cygwin.com/packages/x86_64/mingw64-x86_64-freeglut/mingw64-x86_64-freeglut-2.8.1-1
+  ["pkg-config" "--personality=x86_64-w64-mingw32" "freeglut"] {os = "win32" & os-distribution = "msys2"}
+]
 depends: [
   "conf-pkg-config" {build}
   "conf-mingw-w64-gcc-x86_64" {build}