Skip to content

Commit 96657e4

Browse files
mserimseri
authored
Merge pull request #28945 from jmid/conf-msys2-fixes-part3
Fix MSys2 side-conditions for conf-packages, part 3/3
2 parents c9a5fb4 + fce355e commit 96657e4

File tree

11 files changed

+32
-27
lines changed
  • packages
    • conf-postgresql/conf-postgresql.2
    • conf-rubberband/conf-rubberband.1
    • conf-sdl2-image/conf-sdl2-image.1
    • conf-sdl2-mixer/conf-sdl2-mixer.1
    • conf-sdl2-net/conf-sdl2-net.1
    • conf-sdl2-ttf/conf-sdl2-ttf.1
    • conf-sdl2/conf-sdl2.1
    • conf-sndfile/conf-sndfile.1
    • conf-sqlite3/conf-sqlite3.1
    • conf-zlib/conf-zlib.1
    • conf-zstd/conf-zstd.1.3.8

11 files changed

+32
-27
lines changed

‎packages/conf-postgresql/conf-postgresql.2/opam‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ build: [
88
["pkgconf" {os = "win32" & os-distribution != "cygwinports"}
99
"--personality=i686-w64-mingw32" {os = "win32" & os-distribution != "cygwinports" & host-arch-x86_32:installed}
1010
"--personality=x86_64-w64-mingw32" {os = "win32" & os-distribution != "cygwinports" & host-arch-x86_64:installed}
11-
"pkg-config" {os != "win32" | os-distribution != "cygwin"}
11+
"pkg-config" {os != "win32" | os-distribution = "cygwinports"}
1212
"libpq"]
1313
]
1414
depends: [

‎packages/conf-rubberband/conf-rubberband.1/opam‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ depends: [
99
]
1010
build: [
1111
["pkg-config" "--exists" "rubberband"] {os != "openbsd" & os != "win32" & !(os = "macos" & os-distribution = "homebrew")}
12-
["pkgconf" "--exists" "rubberband"] {(os = "win32" & os-distribution != "msys2") | (os = "macos" & os-distribution = "homebrew")}
12+
["pkgconf" "--exists" "rubberband"] {os = "macos" & os-distribution = "homebrew"}
13+
["pkgconf" "--personality=x86_64-w64-mingw32" "--exists" "rubberband"] {os = "win32" & os-distribution = "msys2"}
1314
]
1415
depexts: [
1516
["librubberband-dev"] {os-family = "debian" | os-family = "ubuntu" | os-family = "opensuse"}
@@ -31,4 +32,4 @@ flags: conf
3132
available: !( # librubberband isn't available on cygwin nor on msys2 for the 32 bit arch
3233
(os-distribution = "cygwin") |
3334
(os = "win32" & os-distribution = "msys2" & arch = "x86_32")
34-
)
35+
)

‎packages/conf-sdl2-image/conf-sdl2-image.1/opam‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ maintainer: "https://github.com/ocaml/opam-repository/issues"
33
homepage: "http://www.libsdl.org/projects/SDL_image/"
44
license: "Zlib"
55
build: [
6-
["pkgconf" "--personality=i686-w64-mingw32" "SDL2_image"] {os = "win32" & os-distribution = "cygwin" & host-arch-x86_32:installed}
7-
["pkgconf" "--personality=x86_64-w64-mingw32" "SDL2_image"] {os = "win32" & os-distribution = "cygwin" & host-arch-x86_64:installed}
8-
["pkg-config" "SDL2_image"] {os != "win32" | os-distribution != "cygwin"}
6+
["pkgconf" "--personality=i686-w64-mingw32" "SDL2_image"] {os = "win32" & os-distribution != "cygwinports" & host-arch-x86_32:installed}
7+
["pkgconf" "--personality=x86_64-w64-mingw32" "SDL2_image"] {os = "win32" & os-distribution != "cygwinports" & host-arch-x86_64:installed}
8+
["pkg-config" "SDL2_image"] {os != "win32" | os-distribution = "cygwinports"}
99
]
1010
depexts: [
1111
["sdl2_image-dev"] {os-distribution = "alpine"}

‎packages/conf-sdl2-mixer/conf-sdl2-mixer.1/opam‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ maintainer: "https://github.com/ocaml/opam-repository/issues"
33
homepage: "http://www.libsdl.org/projects/SDL_mixer/"
44
license: "Zlib"
55
build: [
6-
["pkgconf" "--personality=i686-w64-mingw32" "SDL2_mixer"] {os = "win32" & os-distribution = "cygwin" & host-arch-x86_32:installed}
7-
["pkgconf" "--personality=x86_64-w64-mingw32" "SDL2_mixer"] {os = "win32" & os-distribution = "cygwin" & host-arch-x86_64:installed}
8-
["pkg-config" "SDL2_mixer"] {os != "win32" | os-distribution != "cygwin"}
6+
["pkgconf" "--personality=i686-w64-mingw32" "SDL2_mixer"] {os = "win32" & os-distribution != "cygwinports" & host-arch-x86_32:installed}
7+
["pkgconf" "--personality=x86_64-w64-mingw32" "SDL2_mixer"] {os = "win32" & os-distribution != "cygwinports" & host-arch-x86_64:installed}
8+
["pkg-config" "SDL2_mixer"] {os != "win32" | os-distribution = "cygwinports"}
99
]
1010
depexts: [
1111
["sdl2_mixer-dev"] {os-family = "alpine"}

‎packages/conf-sdl2-net/conf-sdl2-net.1/opam‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ maintainer: "https://github.com/ocaml/opam-repository/issues"
33
homepage: "http://www.libsdl.org/projects/SDL_net/"
44
license: "Zlib"
55
build: [
6-
["pkgconf" "--personality=i686-w64-mingw32" "SDL2_net"] {os = "win32" & os-distribution = "cygwin" & host-arch-x86_32:installed}
7-
["pkgconf" "--personality=x86_64-w64-mingw32" "SDL2_net"] {os = "win32" & os-distribution = "cygwin" & host-arch-x86_64:installed}
8-
["pkg-config" "SDL2_net"] {os != "win32" | os-distribution != "cygwin"}
6+
["pkgconf" "--personality=i686-w64-mingw32" "SDL2_net"] {os = "win32" & os-distribution != "cygwinports" & host-arch-x86_32:installed}
7+
["pkgconf" "--personality=x86_64-w64-mingw32" "SDL2_net"] {os = "win32" & os-distribution != "cygwinports" & host-arch-x86_64:installed}
8+
["pkg-config" "SDL2_net"] {os != "win32" | os-distribution = "cygwinports"}
99
]
1010
depexts: [
1111
["sdl2_net"] {os-family = "arch"}

‎packages/conf-sdl2-ttf/conf-sdl2-ttf.1/opam‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ maintainer: "https://github.com/ocaml/opam-repository/issues"
33
homepage: "http://www.libsdl.org/projects/SDL_ttf/"
44
license: "Zlib"
55
build: [
6-
["pkgconf" "--personality=i686-w64-mingw32" "SDL2_ttf"] {os = "win32" & os-distribution = "cygwin" & host-arch-x86_32:installed}
7-
["pkgconf" "--personality=x86_64-w64-mingw32" "SDL2_ttf"] {os = "win32" & os-distribution = "cygwin" & host-arch-x86_64:installed}
8-
["pkg-config" "SDL2_ttf"] {os != "win32" | os-distribution != "cygwin"}
6+
["pkgconf" "--personality=i686-w64-mingw32" "SDL2_ttf"] {os = "win32" & os-distribution != "cygwinports" & host-arch-x86_32:installed}
7+
["pkgconf" "--personality=x86_64-w64-mingw32" "SDL2_ttf"] {os = "win32" & os-distribution != "cygwinports" & host-arch-x86_64:installed}
8+
["pkg-config" "SDL2_ttf"] {os != "win32" | os-distribution = "cygwinports"}
99
]
1010
depends: [
1111
"conf-pkg-config" {build}

‎packages/conf-sdl2/conf-sdl2.1/opam‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ build: [
1212
"--personality=x86_64-w64-mingw32"
1313
{os = "win32" & os-distribution != "cygwinports" &
1414
host-arch-x86_64:installed}
15-
"pkg-config" {os != "win32" | os-distribution != "cygwin"}
15+
"pkg-config" {os != "win32" | os-distribution = "cygwinports"}
1616
"sdl2"
1717
]
1818
depexts: [

‎packages/conf-sndfile/conf-sndfile.1/opam‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,13 @@ authors: "libsndfile developers"
66
license: "LGPL-2.1-or-later"
77
build: [
88
["pkg-config" "--exists" "sndfile"] {os != "openbsd" & os != "win32" & !(os = "macos" & os-distribution = "homebrew")}
9-
["pkgconf" "--exists" "sndfile"] {(os = "win32" & os-distribution != "msys2") | (os = "macos" & os-distribution = "homebrew")}
9+
["pkgconf" "--exists" "sndfile"] {os = "macos" & os-distribution = "homebrew"}
10+
["pkgconf" "--personality=i686-w64-mingw32" "--exists" "sndfile"] {os = "win32" & os-distribution = "msys2" & host-arch-x86_32:installed}
11+
["pkgconf" "--personality=x86_64-w64-mingw32" "--exists" "sndfile"] {os = "win32" & os-distribution = "msys2" & host-arch-x86_64:installed}
1012
]
1113
depends: [
1214
"conf-pkg-config" {build}
15+
("host-arch-x86_32" {os = "win32" & os-distribution = "msys2"} | "host-arch-x86_64" {os = "win32" & os-distribution = "msys2"})
1316
]
1417
depexts: [
1518
["libsndfile-dev"] {os-family = "debian" | os-family = "ubuntu" | os-distribution = "alpine"}
@@ -21,4 +24,4 @@ depexts: [
2124
synopsis: "Virtual package relying on sndfile"
2225
description:
2326
"This package can only install if the sndfile library is installed on the system."
24-
flags: conf
27+
flags: conf

‎packages/conf-sqlite3/conf-sqlite3.1/opam‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ build: [
1212
["pkgconf" {os = "win32" & os-distribution != "cygwinports"}
1313
"--personality=i686-w64-mingw32" {os = "win32" & os-distribution != "cygwinports" & host-arch-x86_32:installed}
1414
"--personality=x86_64-w64-mingw32" {os = "win32" & os-distribution != "cygwinports" & host-arch-x86_64:installed}
15-
"pkg-config" {os != "win32" | os-distribution != "cygwin"}
15+
"pkg-config" {os != "win32" | os-distribution = "cygwinports"}
1616
"sqlite3"]
1717
]
1818
depends: [

‎packages/conf-zlib/conf-zlib.1/opam‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ bug-reports: "https://github.com/ocaml/opam-repository/issues"
55
authors: ["Jean-loup Gailly" "Mark Adler"]
66
license: "zlib"
77
build:
8-
["pkgconf" {os = "win32" & os-distribution = "cygwin"}
9-
"pkg-config" {os != "win32" | os-distribution != "cygwin"}
10-
"--personality=i686-w64-mingw32" {os = "win32" & os-distribution = "cygwin" & host-arch-x86_32:installed}
11-
"--personality=x86_64-w64-mingw32" {os = "win32" & os-distribution = "cygwin" & host-arch-x86_64:installed}
8+
["pkgconf" {os = "win32" & os-distribution != "cygwinports"}
9+
"pkg-config" {os != "win32" | os-distribution = "cygwinports"}
10+
"--personality=i686-w64-mingw32" {os = "win32" & os-distribution != "cygwinports" & host-arch-x86_32:installed}
11+
"--personality=x86_64-w64-mingw32" {os = "win32" & os-distribution != "cygwinports" & host-arch-x86_64:installed}
1212
"zlib"]
1313
depends: [
1414
"conf-pkg-config" {build}

0 commit comments

Comments
 (0)