From 3a3372b0b90d30707151ff18add4ee276a5b7181 Mon Sep 17 00:00:00 2001 From: David Allsopp Date: Sat, 20 Apr 2024 08:38:33 +0100 Subject: [PATCH] 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. --- packages/ocaml-variants/ocaml-variants.5.1.0+options/opam | 7 +++++++ packages/ocaml-variants/ocaml-variants.5.1.0+tsan/opam | 7 +++++++ .../ocaml-variants/ocaml-variants.5.1.1+effect-syntax/opam | 7 +++++++ packages/ocaml-variants/ocaml-variants.5.1.1+options/opam | 7 +++++++ packages/ocaml-variants/ocaml-variants.5.1.1+tsan/opam | 7 +++++++ 5 files changed, 35 insertions(+) diff --git a/packages/ocaml-variants/ocaml-variants.5.1.0+options/opam b/packages/ocaml-variants/ocaml-variants.5.1.0+options/opam index ece0b10eb66b..94a8888a7e7e 100644 --- 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 index 3f2bb9a01095..d8456040c523 100644 --- 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 index 5e422f4b9702..c63e244b9d85 100644 --- 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 index 975095477127..210c12ebd441 100644 --- 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 index dc66ff9f7c66..e723f1c6628d 100644 --- 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" +}