From 366425ae1d530cabbd8f8ce131d2c1f8e6334e94 Mon Sep 17 00:00:00 2001 From: David Allsopp Date: Thu, 6 Jul 2023 14:53:44 +0100 Subject: [PATCH 1/2] Correct architecture mapping for OCaml 5.1.0 ocaml-option-bytecode-only pulled in only for ppc64. Technically, s390x wasn't available in native code for alpha1. --- .../ocaml-base-compiler/ocaml-base-compiler.5.1.0~alpha1/opam | 1 + .../ocaml-base-compiler/ocaml-base-compiler.5.1.0~alpha2/opam | 1 + .../ocaml-base-compiler/ocaml-base-compiler.5.1.0~beta1/opam | 1 + packages/ocaml-variants/ocaml-variants.5.1.0+trunk/opam | 2 +- .../ocaml-variants/ocaml-variants.5.1.0~alpha1+options/opam | 2 +- .../ocaml-variants/ocaml-variants.5.1.0~alpha2+options/opam | 2 +- packages/ocaml-variants/ocaml-variants.5.1.0~beta1+options/opam | 2 +- 7 files changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/ocaml-base-compiler/ocaml-base-compiler.5.1.0~alpha1/opam b/packages/ocaml-base-compiler/ocaml-base-compiler.5.1.0~alpha1/opam index 5bcdefe48e1..67c060ac4e8 100644 --- a/packages/ocaml-base-compiler/ocaml-base-compiler.5.1.0~alpha1/opam +++ b/packages/ocaml-base-compiler/ocaml-base-compiler.5.1.0~alpha1/opam @@ -14,6 +14,7 @@ depends: [ "base-domains" {post} "base-nnp" {post} "ocaml-options-vanilla" {post} + "ocaml-option-bytecode-only" {arch = "ppc64" | arch = "s390x"} "ocaml-beta" {opam-version < "2.1.0"} ] conflict-class: "ocaml-core-compiler" diff --git a/packages/ocaml-base-compiler/ocaml-base-compiler.5.1.0~alpha2/opam b/packages/ocaml-base-compiler/ocaml-base-compiler.5.1.0~alpha2/opam index 1305c470836..d33f10b681a 100644 --- a/packages/ocaml-base-compiler/ocaml-base-compiler.5.1.0~alpha2/opam +++ b/packages/ocaml-base-compiler/ocaml-base-compiler.5.1.0~alpha2/opam @@ -14,6 +14,7 @@ depends: [ "base-domains" {post} "base-nnp" {post} "ocaml-options-vanilla" {post} + "ocaml-option-bytecode-only" {arch = "ppc64"} "ocaml-beta" {opam-version < "2.1.0"} ] conflict-class: "ocaml-core-compiler" diff --git a/packages/ocaml-base-compiler/ocaml-base-compiler.5.1.0~beta1/opam b/packages/ocaml-base-compiler/ocaml-base-compiler.5.1.0~beta1/opam index 8c082bb9536..ce260ae4a8a 100644 --- a/packages/ocaml-base-compiler/ocaml-base-compiler.5.1.0~beta1/opam +++ b/packages/ocaml-base-compiler/ocaml-base-compiler.5.1.0~beta1/opam @@ -14,6 +14,7 @@ depends: [ "base-domains" {post} "base-nnp" {post} "ocaml-options-vanilla" {post} + "ocaml-option-bytecode-only" {arch = "ppc64"} "ocaml-beta" {opam-version < "2.1.0"} ] conflict-class: "ocaml-core-compiler" diff --git a/packages/ocaml-variants/ocaml-variants.5.1.0+trunk/opam b/packages/ocaml-variants/ocaml-variants.5.1.0+trunk/opam index 103103fddd9..c8db6c2a928 100644 --- a/packages/ocaml-variants/ocaml-variants.5.1.0+trunk/opam +++ b/packages/ocaml-variants/ocaml-variants.5.1.0+trunk/opam @@ -13,7 +13,7 @@ depends: [ "base-threads" {post} "base-domains" {post} "base-nnp" {post} - "ocaml-option-bytecode-only" {arch != "arm64" & arch != "x86_64"} + "ocaml-option-bytecode-only" {arch = "ppc64"} "ocaml-beta" {opam-version < "2.1.0"} ] conflict-class: "ocaml-core-compiler" diff --git a/packages/ocaml-variants/ocaml-variants.5.1.0~alpha1+options/opam b/packages/ocaml-variants/ocaml-variants.5.1.0~alpha1+options/opam index ef5e1906af9..31c0f3dc5de 100644 --- a/packages/ocaml-variants/ocaml-variants.5.1.0~alpha1+options/opam +++ b/packages/ocaml-variants/ocaml-variants.5.1.0~alpha1+options/opam @@ -13,7 +13,7 @@ depends: [ "base-threads" {post} "base-domains" {post} "base-nnp" {post} - "ocaml-option-bytecode-only" {arch != "arm64" & arch != "x86_64"} + "ocaml-option-bytecode-only" {arch = "ppc64" | arch = "s390x"} "ocaml-beta" {opam-version < "2.1.0"} ] conflict-class: "ocaml-core-compiler" diff --git a/packages/ocaml-variants/ocaml-variants.5.1.0~alpha2+options/opam b/packages/ocaml-variants/ocaml-variants.5.1.0~alpha2+options/opam index c3b32569526..d90c5f61210 100644 --- a/packages/ocaml-variants/ocaml-variants.5.1.0~alpha2+options/opam +++ b/packages/ocaml-variants/ocaml-variants.5.1.0~alpha2+options/opam @@ -13,7 +13,7 @@ depends: [ "base-threads" {post} "base-domains" {post} "base-nnp" {post} - "ocaml-option-bytecode-only" {arch != "arm64" & arch != "x86_64" & arch != "s390x" & arch != "riscv" } + "ocaml-option-bytecode-only" {arch = "ppc64"} "ocaml-beta" {opam-version < "2.1.0"} ] conflict-class: "ocaml-core-compiler" diff --git a/packages/ocaml-variants/ocaml-variants.5.1.0~beta1+options/opam b/packages/ocaml-variants/ocaml-variants.5.1.0~beta1+options/opam index 071d8cbc8ff..3ef15958efe 100644 --- a/packages/ocaml-variants/ocaml-variants.5.1.0~beta1+options/opam +++ b/packages/ocaml-variants/ocaml-variants.5.1.0~beta1+options/opam @@ -13,7 +13,7 @@ depends: [ "base-threads" {post} "base-domains" {post} "base-nnp" {post} - "ocaml-option-bytecode-only" {arch != "arm64" & arch != "x86_64" & arch != "s390x" & arch != "riscv" } + "ocaml-option-bytecode-only" {arch = "ppc64"} "ocaml-beta" {opam-version < "2.1.0"} ] conflict-class: "ocaml-core-compiler" From 3985a57e3dd41d02178846fb0a70bed28615c30b Mon Sep 17 00:00:00 2001 From: David Allsopp Date: Thu, 6 Jul 2023 14:54:24 +0100 Subject: [PATCH 2/2] Correct architectures for OCaml 5.2 --- packages/ocaml-variants/ocaml-variants.5.2.0+trunk/opam | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/ocaml-variants/ocaml-variants.5.2.0+trunk/opam b/packages/ocaml-variants/ocaml-variants.5.2.0+trunk/opam index ed816da0772..7bb9c7b6467 100644 --- a/packages/ocaml-variants/ocaml-variants.5.2.0+trunk/opam +++ b/packages/ocaml-variants/ocaml-variants.5.2.0+trunk/opam @@ -13,7 +13,6 @@ depends: [ "base-threads" {post} "base-domains" {post} "base-nnp" {post} - "ocaml-option-bytecode-only" {arch != "arm64" & arch != "x86_64"} "ocaml-beta" {opam-version < "2.1.0"} ] conflict-class: "ocaml-core-compiler"