Skip to content

Fix MSys2 side-conditions for conf-packages, part 2/3 #28944

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Nov 26, 2025
Merged

Fix MSys2 side-conditions for conf-packages, part 2/3 #28944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2f2be6b
Fix MinGW side-condition in conf-gtksourceview3
jmid Nov 20, 2025
fc6ca0f
Fix MinGW side-condition in conf-libevent
jmid Nov 21, 2025
6d0fdef
Fix MinGW side-conditions in conf-libffi
jmid Nov 21, 2025
1e80706
Fix MinGW side-conditions in conf-liblz4
jmid Nov 21, 2025
968bb11
Fix MinGW side-conditions in conf-libpcre2-8
jmid Nov 21, 2025
98d5b40
Fix MinGW side-conditions in conf-libpcre
jmid Nov 21, 2025
01b4437
Fix MinGW side-conditions in conf-libssl
jmid Nov 21, 2025
5bb3dc3
Fix MinGW side-condition in conf-ncurses
jmid Nov 21, 2025
68e287f
Remove available-guard from conf-mingw-w64-pcre-{i686,x86_64} prevent…
jmid Nov 21, 2025
4b915fb
Test for 'ncursesw' on MSys2 instead
jmid Nov 25, 2025
4a07cf5
Also updated tested package name in conf-mingw-w64-ncurses-*
jmid Nov 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/conf-gtksourceview3/conf-gtksourceview3.0+2/opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ bug-reports: "https://github.com/ocaml/opam-repository/issues"
homepage: "https://projects.gnome.org/gtksourceview/"
license: "LGPL-2.1-or-later"
build: [
["pkgconf" "--personality=i686-w64-mingw32" "--short-errors" "--print-errors" "gtksourceview-3.0"] {os = "win32" & os-distribution = "cygwin" & host-arch-x86_32:installed}
["pkgconf" "--personality=x86_64-w64-mingw32" "--short-errors" "--print-errors" "gtksourceview-3.0"] {os = "win32" & os-distribution = "cygwin" & host-arch-x86_64:installed}
["pkg-config" "--short-errors" "--print-errors" "gtksourceview-3.0"] {os != "win32" | os-distribution != "cygwin"}
["pkgconf" "--personality=i686-w64-mingw32" "--short-errors" "--print-errors" "gtksourceview-3.0"] {os = "win32" & os-distribution != "cygwinports" & host-arch-x86_32:installed}
["pkgconf" "--personality=x86_64-w64-mingw32" "--short-errors" "--print-errors" "gtksourceview-3.0"] {os = "win32" & os-distribution != "cygwinports" & host-arch-x86_64:installed}
["pkg-config" "--short-errors" "--print-errors" "gtksourceview-3.0"] {os != "win32" | os-distribution = "cygwinports"}
]
depends: [
"conf-pkg-config" {build}
Expand Down
2 changes: 1 addition & 1 deletion packages/conf-libevent/conf-libevent.1/opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ build: [
"--personality=x86_64-w64-mingw32"
{os = "win32" & os-distribution != "cygwinports" &
host-arch-x86_64:installed}
"pkg-config" {os != "Win32" | os-distribution != "cygwin"}
"pkg-config" {os != "Win32" | os-distribution = "cygwinports"}
"libevent"
]
depends: [
Expand Down
8 changes: 4 additions & 4 deletions packages/conf-libffi/conf-libffi.2.0.0/opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ authors: ["Anthony Green"]
homepage: "http://sourceware.org/libffi/"
license: "MIT"
build: [
"pkgconf" {os = "win32" & os-distribution = "cygwin"}
"--personality=i686-w64-mingw32" {os = "win32" & os-distribution = "cygwin" & host-arch-x86_32:installed}
"--personality=x86_64-w64-mingw32" {os = "win32" & os-distribution = "cygwin" & host-arch-x86_64:installed}
"pkg-config" {os != "win32" | os-distribution != "cygwin"}
"pkgconf" {os = "win32" & os-distribution != "cygwinports"}
"--personality=i686-w64-mingw32" {os = "win32" & os-distribution != "cygwinports" & host-arch-x86_32:installed}
"--personality=x86_64-w64-mingw32" {os = "win32" & os-distribution != "cygwinports" & host-arch-x86_64:installed}
"pkg-config" {os != "win32" | os-distribution = "cygwinports"}
"libffi"
]
depexts: [
Expand Down
6 changes: 3 additions & 3 deletions packages/conf-liblz4/conf-liblz4.1/opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ bug-reports: "https://github.com/ocaml/opam-repository/issues"
authors: ["Yann Collet"]
license: ["GPL-2.0-only" "BSD-2-Clause"]
build: [
["pkgconf" "--personality=i686-w64-mingw32" "liblz4"] {os = "win32" & os-distribution = "cygwin" & host-arch-x86_32:installed}
["pkgconf" "--personality=x86_64-w64-mingw32" "liblz4"] {os = "win32" & os-distribution = "cygwin" & host-arch-x86_64:installed}
["pkg-config" "liblz4"] {os != "win32" | os-distribution != "cygwin"}
["pkgconf" "--personality=i686-w64-mingw32" "liblz4"] {os = "win32" & os-distribution != "cygwinports" & host-arch-x86_32:installed}
["pkgconf" "--personality=x86_64-w64-mingw32" "liblz4"] {os = "win32" & os-distribution != "cygwinports" & host-arch-x86_64:installed}
["pkg-config" "liblz4"] {os != "win32" | os-distribution = "cygwinports"}
]
depends: [
"conf-pkg-config" {build}
Expand Down
12 changes: 6 additions & 6 deletions packages/conf-libpcre/conf-libpcre.2/opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ homepage: "http://www.pcre.org/"
dev-repo: "git+https://github.com/mmottl/pcre-ocaml.git"
license: "BSD-3-Clause"
build:
["pkgconf" {os = "win32" & os-distribution = "cygwin"}
"--personality=i686-w64-mingw32" {os = "win32" & os-distribution = "cygwin" & host-arch-x86_32:installed}
"--personality=x86_64-w64-mingw32" {os = "win32" & os-distribution = "cygwin" & host-arch-x86_64:installed}
"pkg-config" {os != "win32" | os-distribution != "cygwin"}
["pkgconf" {os = "win32" & os-distribution != "cygwinports"}
"--personality=i686-w64-mingw32" {os = "win32" & os-distribution != "cygwinports" & host-arch-x86_32:installed}
"--personality=x86_64-w64-mingw32" {os = "win32" & os-distribution != "cygwinports" & host-arch-x86_64:installed}
"pkg-config" {os != "win32" | os-distribution = "cygwinports"}
"--print-errors" "--exists" "libpcre"]
depends: [
"conf-pkg-config" {build}
("host-arch-x86_32" {os = "win32" & os-distribution = "cygwin"} & "conf-mingw-w64-pcre-i686" {os = "win32" & os-distribution = "cygwin"} |
"host-arch-x86_64" {os = "win32" & os-distribution = "cygwin"} & "conf-mingw-w64-pcre-x86_64" {os = "win32" & os-distribution = "cygwin"})
("host-arch-x86_32" {os = "win32" & os-distribution != "cygwinports"} & "conf-mingw-w64-pcre-i686" {os = "win32" & os-distribution != "cygwinports"} |
"host-arch-x86_64" {os = "win32" & os-distribution != "cygwinports"} & "conf-mingw-w64-pcre-x86_64" {os = "win32" & os-distribution != "cygwinports"})
]
bug-reports: "https://github.com/ocaml/opam-repository/issues"
depexts: [
Expand Down
8 changes: 4 additions & 4 deletions packages/conf-libpcre2-8/conf-libpcre2-8.2/opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ homepage: "https://www.pcre.org/"
dev-repo: "git+https://github.com/PCRE2Project/pcre2.git"
license: "BSD-3-Clause"
build: [
["pkgconf" {os = "win32" & os-distribution = "cygwin"}
"--personality=i686-w64-mingw32" {os = "win32" & os-distribution = "cygwin" & host-arch-x86_32:installed}
"--personality=x86_64-w64-mingw32" {os = "win32" & os-distribution = "cygwin" & host-arch-x86_64:installed}
"pkg-config" {os != "win32" | os-distribution != "cygwin"}
["pkgconf" {os = "win32" & os-distribution != "cygwinports"}
"--personality=i686-w64-mingw32" {os = "win32" & os-distribution != "cygwinports" & host-arch-x86_32:installed}
"--personality=x86_64-w64-mingw32" {os = "win32" & os-distribution != "cygwinports" & host-arch-x86_64:installed}
"pkg-config" {os != "win32" | os-distribution = "cygwinports"}
"--print-errors" "--exists" "libpcre2-8"
]]
depends: [
Expand Down
8 changes: 4 additions & 4 deletions packages/conf-libssl/conf-libssl.4/opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ build-env: [
[HOMEBREW_NO_AUTO_UPDATE = "1"]
]
build: [
["pkgconf" {os = "win32" & os-distribution = "cygwin"}
"--personality=i686-w64-mingw32" {os = "win32" & os-distribution = "cygwin" & host-arch-x86_32:installed}
"--personality=x86_64-w64-mingw32" {os = "win32" & os-distribution = "cygwin" & host-arch-x86_64:installed}
"pkg-config" {os != "win32" | os-distribution != "cygwin"}
["pkgconf" {os = "win32" & os-distribution != "cygwinports"}
"--personality=i686-w64-mingw32" {os = "win32" & os-distribution != "cygwinports" & host-arch-x86_32:installed}
"--personality=x86_64-w64-mingw32" {os = "win32" & os-distribution != "cygwinports" & host-arch-x86_64:installed}
"pkg-config" {os != "win32" | os-distribution = "cygwinports"}
"--print-errors" "--exists" "openssl"]
{os != "freebsd" & os != "openbsd" & os != "netbsd" & # libssl is provided by base system on BSDs
os-distribution != "homebrew"}
Expand Down
5 changes: 4 additions & 1 deletion packages/conf-mingw-w64-ncurses-i686/conf-mingw-w64-ncurses-i686.1/opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ bug-reports: "https://github.com/ocaml/opam-repository/issues"
license: "MIT"
flags: conf
available: os = "win32"
build: ["pkgconf" "--personality=i686-w64-mingw32" "ncurses"]
build: ["pkgconf" "--personality=i686-w64-mingw32"
"ncurses" {os-distribution = "cygwin"}
"ncursesw" {os-distribution = "msys2"}
]
depends: [
"conf-pkg-config" {build}
"conf-mingw-w64-gcc-i686" {build}
Expand Down
5 changes: 4 additions & 1 deletion packages/conf-mingw-w64-ncurses-x86_64/conf-mingw-w64-ncurses-x86_64.1/opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ bug-reports: "https://github.com/ocaml/opam-repository/issues"
license: "MIT"
flags: conf
available: os = "win32"
build: ["pkgconf" "--personality=x86_64-w64-mingw32" "ncurses"]
build: ["pkgconf" "--personality=x86_64-w64-mingw32"
"ncurses" {os-distribution = "cygwin"}
"ncursesw" {os-distribution = "msys2"}
]
depends: [
"conf-pkg-config" {build}
"conf-mingw-w64-gcc-x86_64" {build}
Expand Down
2 changes: 1 addition & 1 deletion packages/conf-mingw-w64-pcre-i686/conf-mingw-w64-pcre-i686.1/opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=i686-w64-mingw32" "libpcre"]
depends: [
"conf-pkg-config" {build}
Expand Down
2 changes: 1 addition & 1 deletion packages/conf-mingw-w64-pcre-x86_64/conf-mingw-w64-pcre-x86_64.1/opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" "libpcre"]
depends: [
"conf-pkg-config" {build}
Expand Down
5 changes: 3 additions & 2 deletions packages/conf-ncurses/conf-ncurses.1/opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ build: [
"--personality=x86_64-w64-mingw32"
{os = "win32" & os-distribution != "cygwinports" &
host-arch-x86_64:installed}
"pkg-config" {os-distribution != "cygwin" & os-distribution != "opensuse" & os != "macos" & os != "freebsd" & os != "netbsd" & os != "openbsd"}
"ncurses" {os-distribution != "opensuse" & os != "macos" & os != "freebsd" & os != "netbsd" & os != "openbsd"}
"pkg-config" {os-distribution != "cygwin" & os-distribution != "msys2" & os-distribution != "opensuse" & os != "macos" & os != "freebsd" & os != "netbsd" & os != "openbsd"}
"ncurses" {os-distribution != "opensuse" & os != "macos" & os != "freebsd" & os != "netbsd" & os != "openbsd" & os-distribution != "msys2"}
"ncursesw" {os-distribution = "msys2"} # MSys2 packages compatible ncursesw https://packages.msys2.org/packages/mingw-w64-x86_64-ncurses
]
depends: [
"conf-pkg-config" {build & os-distribution != "opensuse" & os != "macos" & os != "freebsd" & os != "netbsd" & os != "openbsd"}
Expand Down
Loading