Merge pull request ocaml#21510 from dra27/bytecode

Fix architecture support for OCaml 5.x

Author: dra27

packages/ocaml-option-32bit/ocaml-option-32bit.1/opam

@@ -4,7 +4,7 @@ depexts: [
   ["gcc-multilib" "g++-multilib"] {os-family = "debian"}
 ]
 depends: [
-  "ocaml-variants" {post & >= "4.12.0~"}
+  "ocaml-variants" {post & >= "4.12.0~" & < "5.0.0~~"} | ("ocaml-variants" {post & >= "5.0.0~~"} "ocaml-option-bytecode-only")
 ]
 available: [ arch = "x86_64" & (os = "linux" | os = "macos") ]
 maintainer: "[email protected]"

packages/ocaml-option-bytecode-only/ocaml-option-bytecode-only.1/opam

@@ -3,5 +3,6 @@ synopsis: "Compile OCaml without the native-code compiler"
 depends: [
   "ocaml-variants" {post & >= "4.12.0~"}
 ]
+conflicts: [ "ocaml-option-afl" "ocaml-option-fp" "ocaml-option-flambda" ]
 maintainer: "[email protected]"
 flags: compiler

packages/ocaml-option-fp/ocaml-option-fp.1/opam

@@ -4,5 +4,6 @@ depends: [
   "ocaml-variants" {post & >= "4.12.0~"}
 ]
 conflicts: ["ocaml-option-musl"]
+available: os = "linux" & arch = "x86_64"
 maintainer: "[email protected]"
 flags: compiler

packages/ocaml-variants/ocaml-variants.5.0.0+trunk/opam

@@ -13,6 +13,7 @@ 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"
@@ -63,14 +64,13 @@ post-messages: [
    to force a sequential build instead."
   {failure & jobs > 1 & os != "cygwin" & opam-version >= "2.0.5"}
 ]
+conflicts: [ "ocaml-option-fp" ]
 depopts: [
   "ocaml-option-32bit"
   "ocaml-option-afl"
-  "ocaml-option-bytecode-only"
   "ocaml-option-default-unsafe-string"
   "ocaml-option-no-flat-float-array"
   "ocaml-option-flambda"
-  "ocaml-option-fp"
   "ocaml-option-musl"
   "ocaml-option-static"
 ]

packages/ocaml-variants/ocaml-variants.5.1.0+trunk/opam

@@ -13,6 +13,7 @@ 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"
@@ -63,14 +64,13 @@ post-messages: [
    to force a sequential build instead."
   {failure & jobs > 1 & os != "cygwin" & opam-version >= "2.0.5"}
 ]
+conflicts: [ "ocaml-option-fp" ]
 depopts: [
   "ocaml-option-32bit"
   "ocaml-option-afl"
-  "ocaml-option-bytecode-only"
   "ocaml-option-default-unsafe-string"
   "ocaml-option-no-flat-float-array"
   "ocaml-option-flambda"
-  "ocaml-option-fp"
   "ocaml-option-musl"
   "ocaml-option-static"
 ]

packages/opam-depext/opam-depext.1.2.1-1/opam

@@ -0,0 +1,53 @@
+opam-version: "2.0"
+synopsis: "Install OS distribution packages"
+description: """\
+opam-depext is a simple program intended to facilitate the interaction between
+OPAM packages and the host package management system. It can query OPAM for the
+right external dependencies on a set of packages, depending on the host OS, and
+call the OS's package manager in the appropriate way to install them."""
+maintainer: [
+  "Louis Gesbert <[email protected]>"
+  "Anil Madhavapeddy <[email protected]>"
+]
+authors: [
+  "Louis Gesbert <[email protected]>"
+  "Anil Madhavapeddy <[email protected]>"
+]
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
+homepage: "https://github.com/ocaml/opam-depext"
+bug-reports: "https://github.com/ocaml/opam-depext/issues"
+depends: [
+  "ocaml" {>= "4.00"}
+  "base-unix"
+  "cmdliner" {>= "0.9.8" & dev}
+  "ocamlfind" {dev}
+]
+depopts: "ocaml-option-bytecode-only"
+available: opam-version >= "2.0.0~beta5"
+flags: plugin
+build: [
+  ["sed" "-ib" "-e" "/all:/s/ncl//" "src_ext/Makefile"]
+  [make "OCAMLOPT=%{ocaml-option-bytecode-only:installed?no:ocamlopt}%"] {!dev}
+  [
+    "ocamlfind"
+    "%{ocaml:native?ocamlopt:ocamlc}%"
+    "-package"
+    "unix,cmdliner"
+    "-linkpkg"
+    "-o"
+    "opam-depext"
+    "depext.ml"
+  ] {dev}
+]
+post-messages:
+  "opam-depext is unnecessary when used with opam >= 2.1. Please use opam install directly instead"
+    {opam-version >= "2.1"}
+dev-repo: "git+https://github.com/ocaml/opam-depext.git#2.0"
+url {
+  src:
+    "https://github.com/ocaml-opam/opam-depext/releases/download/v1.2.1/opam-depext-full-1.2.1.tbz"
+  checksum: [
+    "md5=7bda1fdbd88322e8f515919c82a37a2a"
+    "sha512=a031289ac4e2d4d28bf02b892313b2a0ee724c94f0b7a131b3d9bccc5fbaf2292834d53dd6a0b7134f43bab06ee70bd2c98562fb3a6a03f1a526981290cbf501"
+  ]
+}