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

dra27 · dra27 · commit 8344d33d45bd · 2024-06-27T22:04:34.000+01:00
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.
diff --git a/packages/ocaml-variants/ocaml-variants.5.1.0+options/opam b/packages/ocaml-variants/ocaml-variants.5.1.0+options/opam
@@ -130,3 +130,10 @@ extra-source "ocaml-variants.install" {
     "md5=3e969b841df1f51ca448e6e6295cb451"
   ]
 }
+# 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
@@ -85,3 +85,10 @@ extra-source "ocaml-variants.install" {
   ]
 }
 available: os != "win32"
+# 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
@@ -133,3 +133,10 @@ extra-source "ocaml-variants.install" {
     "md5=3e969b841df1f51ca448e6e6295cb451"
   ]
 }
+# 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
@@ -130,3 +130,10 @@ extra-source "ocaml-variants.install" {
     "md5=3e969b841df1f51ca448e6e6295cb451"
   ]
 }
+# 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
@@ -85,3 +85,10 @@ extra-source "ocaml-variants.install" {
   ]
 }
 available: os != "win32"
+# 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"
+}

Original file line number	Diff line number	Diff line change
`@@ -130,3 +130,10 @@ extra-source "ocaml-variants.install" {`
`130`	`130`	`"md5=3e969b841df1f51ca448e6e6295cb451"`
`131`	`131`	`]`
`132`	`132`	`}`
	`133`	`+# Back-ported ocaml/ocaml#13100 (5.2.0) - fixes the misdetection of zstd with`
	`134`	`+# ocaml-option-musl`
	`135`	`+patches: ["zstd-detection.patch"]`
	`136`	`+extra-source "zstd-detection.patch" {`
	`137`	`+ src: "https://github.com/ocaml/ocaml/commit/baf65b91c51bb04b09ecc98b94ddd4ba3b446912.patch?full_index=1"`
	`138`	`+ checksum: "sha256=958e061bc3b967e32a5606d5109ed7faacb9b793fe2de0e8f8697c23a178c5cf"`
	`139`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -85,3 +85,10 @@ extra-source "ocaml-variants.install" {`
`85`	`85`	`]`
`86`	`86`	`}`
`87`	`87`	`available: os != "win32"`
	`88`	`+# Back-ported ocaml/ocaml#13100 (5.2.0) - fixes the misdetection of zstd with`
	`89`	`+# ocaml-option-musl`
	`90`	`+patches: ["zstd-detection.patch"]`
	`91`	`+extra-source "zstd-detection.patch" {`
	`92`	`+ src: "https://github.com/ocaml/ocaml/commit/baf65b91c51bb04b09ecc98b94ddd4ba3b446912.patch?full_index=1"`
	`93`	`+ checksum: "sha256=958e061bc3b967e32a5606d5109ed7faacb9b793fe2de0e8f8697c23a178c5cf"`
	`94`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -133,3 +133,10 @@ extra-source "ocaml-variants.install" {`
`133`	`133`	`"md5=3e969b841df1f51ca448e6e6295cb451"`
`134`	`134`	`]`
`135`	`135`	`}`
	`136`	`+# Back-ported ocaml/ocaml#13100 (5.2.0) - fixes the misdetection of zstd with`
	`137`	`+# ocaml-option-musl`
	`138`	`+patches: ["zstd-detection.patch"]`
	`139`	`+extra-source "zstd-detection.patch" {`
	`140`	`+ src: "https://github.com/ocaml/ocaml/commit/baf65b91c51bb04b09ecc98b94ddd4ba3b446912.patch?full_index=1"`
	`141`	`+ checksum: "sha256=958e061bc3b967e32a5606d5109ed7faacb9b793fe2de0e8f8697c23a178c5cf"`
	`142`	`+}`