Backport ocaml/ocaml#13100 to 5.1.x ocaml-variants

When building with ocaml-option-musl, zstd detection in OCaml fails if pkg-config and libzstd are installed for the host. This is fixed in 5.2.0. ocaml-base-compiler is unaffected.
ocaml · May 20, 2024 · 3a3372b · 3a3372b
1 parent 97de337
commit 3a3372b
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 0 deletions.
diff --git a/packages/ocaml-variants/ocaml-variants.5.1.0+options/opam b/packages/ocaml-variants/ocaml-variants.5.1.0+options/opam
@@ -80,3 +80,10 @@ depopts: [
   "ocaml-option-address-sanitizer"
   "ocaml-option-static"
 ]
+# Back-ported ocaml/ocaml#13100 (5.2.0) - fixes the misdetection of zstd with
+# ocaml-option-musl
+patches: ["zstd-detection.patch"]
+extra-source "zstd-detection.patch" {
+  src: "https://github.com/ocaml/ocaml/commit/baf65b91c51bb04b09ecc98b94ddd4ba3b446912.patch?full_index=1"
+  checksum: "sha256=958e061bc3b967e32a5606d5109ed7faacb9b793fe2de0e8f8697c23a178c5cf"
+}
diff --git a/packages/ocaml-variants/ocaml-variants.5.1.0+tsan/opam b/packages/ocaml-variants/ocaml-variants.5.1.0+tsan/opam
@@ -77,3 +77,10 @@ depopts: [
   "ocaml-option-address-sanitizer"
   "ocaml-option-static"
 ]
+# Back-ported ocaml/ocaml#13100 (5.2.0) - fixes the misdetection of zstd with
+# ocaml-option-musl
+patches: ["zstd-detection.patch"]
+extra-source "zstd-detection.patch" {
+  src: "https://github.com/ocaml/ocaml/commit/baf65b91c51bb04b09ecc98b94ddd4ba3b446912.patch?full_index=1"
+  checksum: "sha256=958e061bc3b967e32a5606d5109ed7faacb9b793fe2de0e8f8697c23a178c5cf"
+}
diff --git a/packages/ocaml-variants/ocaml-variants.5.1.1+effect-syntax/opam b/packages/ocaml-variants/ocaml-variants.5.1.1+effect-syntax/opam
@@ -82,3 +82,10 @@ depopts: [
   "ocaml-option-address-sanitizer"
   "ocaml-option-static"
 ]
+# Back-ported ocaml/ocaml#13100 (5.2.0) - fixes the misdetection of zstd with
+# ocaml-option-musl
+patches: ["zstd-detection.patch"]
+extra-source "zstd-detection.patch" {
+  src: "https://github.com/ocaml/ocaml/commit/baf65b91c51bb04b09ecc98b94ddd4ba3b446912.patch?full_index=1"
+  checksum: "sha256=958e061bc3b967e32a5606d5109ed7faacb9b793fe2de0e8f8697c23a178c5cf"
+}
diff --git a/packages/ocaml-variants/ocaml-variants.5.1.1+options/opam b/packages/ocaml-variants/ocaml-variants.5.1.1+options/opam
@@ -80,3 +80,10 @@ depopts: [
   "ocaml-option-address-sanitizer"
   "ocaml-option-static"
 ]
+# Back-ported ocaml/ocaml#13100 (5.2.0) - fixes the misdetection of zstd with
+# ocaml-option-musl
+patches: ["zstd-detection.patch"]
+extra-source "zstd-detection.patch" {
+  src: "https://github.com/ocaml/ocaml/commit/baf65b91c51bb04b09ecc98b94ddd4ba3b446912.patch?full_index=1"
+  checksum: "sha256=958e061bc3b967e32a5606d5109ed7faacb9b793fe2de0e8f8697c23a178c5cf"
+}
diff --git a/packages/ocaml-variants/ocaml-variants.5.1.1+tsan/opam b/packages/ocaml-variants/ocaml-variants.5.1.1+tsan/opam
@@ -77,3 +77,10 @@ depopts: [
   "ocaml-option-address-sanitizer"
   "ocaml-option-static"
 ]
+# Back-ported ocaml/ocaml#13100 (5.2.0) - fixes the misdetection of zstd with
+# ocaml-option-musl
+patches: ["zstd-detection.patch"]
+extra-source "zstd-detection.patch" {
+  src: "https://github.com/ocaml/ocaml/commit/baf65b91c51bb04b09ecc98b94ddd4ba3b446912.patch?full_index=1"
+  checksum: "sha256=958e061bc3b967e32a5606d5109ed7faacb9b793fe2de0e8f8697c23a178c5cf"
+}