Skip to content

Commit

Permalink
Fix disjunction for ocaml-option-32bit
Browse files Browse the repository at this point in the history
  • Loading branch information
@dra27
dra27 committed Jun 6, 2024
1 parent dff7459 commit aef43ad
Show file tree
Hide file tree
Showing 21 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion packages/ocaml-variants/ocaml-variants.4.13.0+options/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ depends: [
# The Windows ports explicitly select the architecture (see below) this
# facility is not yet available for other platforms.
"host-arch-x86_32" {os != "win32" & arch = "x86_32" & post}
(("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32"}) |
(("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32" & arch = "x86_64"}) |
"host-arch-x86_64" {os != "win32" & arch = "x86_64" & post})
"host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post}

Expand Down
2 changes: 1 addition & 1 deletion packages/ocaml-variants/ocaml-variants.4.13.1+options/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ depends: [
# The Windows ports explicitly select the architecture (see below) this
# facility is not yet available for other platforms.
"host-arch-x86_32" {os != "win32" & arch = "x86_32" & post}
(("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32"}) |
(("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32" & arch = "x86_64"}) |
"host-arch-x86_64" {os != "win32" & arch = "x86_64" & post})
"host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post}

Expand Down
2 changes: 1 addition & 1 deletion packages/ocaml-variants/ocaml-variants.4.13.2+trunk/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ depends: [
# The Windows ports explicitly select the architecture (see below) this
# facility is not yet available for other platforms.
"host-arch-x86_32" {os != "win32" & arch = "x86_32" & post}
(("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32"}) |
(("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32" & arch = "x86_64"}) |
"host-arch-x86_64" {os != "win32" & arch = "x86_64" & post})
"host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post}

Expand Down
2 changes: 1 addition & 1 deletion packages/ocaml-variants/ocaml-variants.4.14.0+options/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ depends: [
# The Windows ports explicitly select the architecture (see below) this
# facility is not yet available for other platforms.
"host-arch-x86_32" {os != "win32" & arch = "x86_32" & post}
(("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32"}) |
(("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32" & arch = "x86_64"}) |
"host-arch-x86_64" {os != "win32" & arch = "x86_64" & post})
"host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post}

Expand Down
2 changes: 1 addition & 1 deletion packages/ocaml-variants/ocaml-variants.4.14.1+options/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ depends: [
# The Windows ports explicitly select the architecture (see below) this
# facility is not yet available for other platforms.
"host-arch-x86_32" {os != "win32" & arch = "x86_32" & post}
(("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32"}) |
(("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32" & arch = "x86_64"}) |
"host-arch-x86_64" {os != "win32" & arch = "x86_64" & post})
"host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post}

Expand Down
2 changes: 1 addition & 1 deletion packages/ocaml-variants/ocaml-variants.4.14.2+options/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ depends: [
# The Windows ports explicitly select the architecture (see below) this
# facility is not yet available for other platforms.
"host-arch-x86_32" {os != "win32" & arch = "x86_32" & post}
(("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32"}) |
(("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32" & arch = "x86_64"}) |
"host-arch-x86_64" {os != "win32" & arch = "x86_64" & post})
"host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post}

Expand Down
2 changes: 1 addition & 1 deletion packages/ocaml-variants/ocaml-variants.4.14.3+trunk/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ depends: [
# The Windows ports explicitly select the architecture (see below) this
# facility is not yet available for other platforms.
"host-arch-x86_32" {os != "win32" & arch = "x86_32" & post}
(("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32"}) |
(("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32" & arch = "x86_64"}) |
"host-arch-x86_64" {os != "win32" & arch = "x86_64" & post})
"host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post}

Expand Down
2 changes: 1 addition & 1 deletion packages/ocaml-variants/ocaml-variants.5.0.0+options/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ depends: [
# The Windows ports explicitly select the architecture (see below) this
# facility is not yet available for other platforms.
"host-arch-x86_32" {os != "win32" & arch = "x86_32" & post}
(("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32"}) |
(("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32" & arch = "x86_64"}) |
"host-arch-x86_64" {os != "win32" & arch = "x86_64" & post})
"host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post}

Expand Down
2 changes: 1 addition & 1 deletion packages/ocaml-variants/ocaml-variants.5.0.1+trunk/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ depends: [
# The Windows ports explicitly select the architecture (see below) this
# facility is not yet available for other platforms.
"host-arch-x86_32" {os != "win32" & arch = "x86_32" & post}
(("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32"}) |
(("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32" & arch = "x86_64"}) |
"host-arch-x86_64" {os != "win32" & arch = "x86_64" & post})
"host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post}

Expand Down
2 changes: 1 addition & 1 deletion packages/ocaml-variants/ocaml-variants.5.1.0+options/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ depends: [
# The Windows ports explicitly select the architecture (see below) this
# facility is not yet available for other platforms.
"host-arch-x86_32" {os != "win32" & arch = "x86_32" & post}
(("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32"}) |
(("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32" & arch = "x86_64"}) |
"host-arch-x86_64" {os != "win32" & arch = "x86_64" & post})
"host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post}

Expand Down
2 changes: 1 addition & 1 deletion packages/ocaml-variants/ocaml-variants.5.1.1+effect-syntax/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ depends: [
# The Windows ports explicitly select the architecture (see below) this
# facility is not yet available for other platforms.
"host-arch-x86_32" {os != "win32" & arch = "x86_32" & post}
(("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32"}) |
(("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32" & arch = "x86_64"}) |
"host-arch-x86_64" {os != "win32" & arch = "x86_64" & post})
"host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post}

Expand Down
2 changes: 1 addition & 1 deletion packages/ocaml-variants/ocaml-variants.5.1.1+options/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ depends: [
# The Windows ports explicitly select the architecture (see below) this
# facility is not yet available for other platforms.
"host-arch-x86_32" {os != "win32" & arch = "x86_32" & post}
(("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32"}) |
(("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32" & arch = "x86_64"}) |
"host-arch-x86_64" {os != "win32" & arch = "x86_64" & post})
"host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post}

Expand Down
2 changes: 1 addition & 1 deletion packages/ocaml-variants/ocaml-variants.5.1.2+trunk/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ depends: [
# The Windows ports explicitly select the architecture (see below) this
# facility is not yet available for other platforms.
"host-arch-x86_32" {os != "win32" & arch = "x86_32" & post}
(("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32"}) |
(("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32" & arch = "x86_64"}) |
"host-arch-x86_64" {os != "win32" & arch = "x86_64" & post})
"host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post}

Expand Down
2 changes: 1 addition & 1 deletion packages/ocaml-variants/ocaml-variants.5.2.0+options/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ depends: [
# The Windows ports explicitly select the architecture (see below) this
# facility is not yet available for other platforms.
"host-arch-x86_32" {os != "win32" & arch = "x86_32" & post}
(("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32"}) |
(("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32" & arch = "x86_64"}) |
"host-arch-x86_64" {os != "win32" & arch = "x86_64" & post})
"host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post}

Expand Down
2 changes: 1 addition & 1 deletion packages/ocaml-variants/ocaml-variants.5.2.0+statmemprof/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ depends: [
# The Windows ports explicitly select the architecture (see below) this
# facility is not yet available for other platforms.
"host-arch-x86_32" {os != "win32" & arch = "x86_32" & post}
(("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32"}) |
(("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32" & arch = "x86_64"}) |
"host-arch-x86_64" {os != "win32" & arch = "x86_64" & post})
"host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post}

Expand Down
2 changes: 1 addition & 1 deletion packages/ocaml-variants/ocaml-variants.5.2.0~alpha1+options/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ depends: [
# The Windows ports explicitly select the architecture (see below) this
# facility is not yet available for other platforms.
"host-arch-x86_32" {os != "win32" & arch = "x86_32" & post}
(("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32"}) |
(("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32" & arch = "x86_64"}) |
"host-arch-x86_64" {os != "win32" & arch = "x86_64" & post})
"host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post}

Expand Down
2 changes: 1 addition & 1 deletion packages/ocaml-variants/ocaml-variants.5.2.0~beta1+options/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ depends: [
# The Windows ports explicitly select the architecture (see below) this
# facility is not yet available for other platforms.
"host-arch-x86_32" {os != "win32" & arch = "x86_32" & post}
(("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32"}) |
(("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32" & arch = "x86_64"}) |
"host-arch-x86_64" {os != "win32" & arch = "x86_64" & post})
"host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post}

Expand Down
2 changes: 1 addition & 1 deletion packages/ocaml-variants/ocaml-variants.5.2.0~beta2+options/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ depends: [
# The Windows ports explicitly select the architecture (see below) this
# facility is not yet available for other platforms.
"host-arch-x86_32" {os != "win32" & arch = "x86_32" & post}
(("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32"}) |
(("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32" & arch = "x86_64"}) |
"host-arch-x86_64" {os != "win32" & arch = "x86_64" & post})
"host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post}

Expand Down
2 changes: 1 addition & 1 deletion packages/ocaml-variants/ocaml-variants.5.2.0~rc1+options/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ depends: [
# The Windows ports explicitly select the architecture (see below) this
# facility is not yet available for other platforms.
"host-arch-x86_32" {os != "win32" & arch = "x86_32" & post}
(("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32"}) |
(("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32" & arch = "x86_64"}) |
"host-arch-x86_64" {os != "win32" & arch = "x86_64" & post})
"host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post}

Expand Down
2 changes: 1 addition & 1 deletion packages/ocaml-variants/ocaml-variants.5.2.1+trunk/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ depends: [
# The Windows ports explicitly select the architecture (see below) this
# facility is not yet available for other platforms.
"host-arch-x86_32" {os != "win32" & arch = "x86_32" & post}
(("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32"}) |
(("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32" & arch = "x86_64"}) |
"host-arch-x86_64" {os != "win32" & arch = "x86_64" & post})
"host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post}

Expand Down
2 changes: 1 addition & 1 deletion packages/ocaml-variants/ocaml-variants.5.3.0+trunk/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ depends: [
# The Windows ports explicitly select the architecture (see below) this
# facility is not yet available for other platforms.
"host-arch-x86_32" {os != "win32" & arch = "x86_32" & post}
(("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32"}) |
(("host-arch-x86_32" {os != "win32" & arch = "x86_64" & post} & "ocaml-option-32bit" {os != "win32" & arch = "x86_64"}) |
"host-arch-x86_64" {os != "win32" & arch = "x86_64" & post})
"host-arch-unknown" {os != "win32" & arch != "arm32" & arch != "arm64" & arch != "ppc64" & arch != "riscv64" & arch != "s390x" & arch != "x86_32" & arch != "x86_64" & post}

Expand Down

0 comments on commit aef43ad

Please sign in to comment.