Fix a bunch of patches failing under opam2.3

ocaml-cross · Dec 16, 2024 · 1cc7628 · 1cc7628
1 parent 8d5c819
commit 1cc7628
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 19 deletions.
diff --git a/packages/base_bigstring-windows/base_bigstring-windows.v0.16.0/opam b/packages/base_bigstring-windows/base_bigstring-windows.v0.16.0/opam
@@ -28,3 +28,6 @@ url {
 src: "https://ocaml.janestreet.com/ocaml-core/v0.16/files/base_bigstring-v0.16.0.tar.gz"
 checksum: "sha256=19fcbf8fa1fa557d513679413a9087e4ff1cb846cef1e8a78eaffb293fa926c3"
 }
+extra-files: [
+  "patches/memmem-shim.patch" "md5=f75d95f1b88dabf4ff7c24622e6dd113"
+]
diff --git a/packages/core-windows/core-windows.v0.16.1/opam b/packages/core-windows/core-windows.v0.16.1/opam
@@ -61,3 +61,6 @@ url {
     "sha512=5f9f4400b6e42b74ffd57223cb67884368d324739565bbb20162547ede8bd6d0ece3cc265503b674829f9cf373784e8036d4c73e26e9196aa5446de69b63e181"
   ]
 }
+extra-files: [
+  "patches/no-endian-header.patch" "md5=1398b42006ed9109a2b3c05b98739f65"
+]
diff --git a/packages/ocaml-windows32/ocaml-windows32.4.14.0/opam b/packages/ocaml-windows32/ocaml-windows32.4.14.0/opam
@@ -28,14 +28,15 @@ conflicts: [
   "ocaml-windows64"
 ]
 synopsis: "OCaml cross-compiler for 32-bit x86 Windows targets"
+url {
+  src: "https://github.com/ocaml/ocaml/archive/4.14.0.tar.gz"
+  checksum: "md5=32cfb000312c9d0e2c187e891c34e8d3"
+}
 extra-files: [
-  ["windows.conf.in" "md5=69f2a64db241a28e172eb316ddd9cef1"]
   ["build.sh" "md5=0c02dc9cf4fa5bb98b8771d22ffd15d9"]
   ["install.sh" "md5=0e6b4e3f042e7443f35cfe7a9980e905"]
-  ["patches/ostype-fix.patch" "md5=05919aebf4e0894bf8f0bc60a6932b46"]
   ["patches/configure.patch" "md5=2947eb1d16daec3d35f769093574249f"]
+  ["patches/ostype-fix.patch" "md5=05919aebf4e0894bf8f0bc60a6932b46"]
+  ["remove.sh" "md5=d2ebe7ce54e4a93a4d71d5fd889f17e3"]
+  ["windows.conf.in" "md5=69f2a64db241a28e172eb316ddd9cef1"]
 ]
-url {
-  src: "https://github.com/ocaml/ocaml/archive/4.14.0.tar.gz"
-  checksum: "md5=32cfb000312c9d0e2c187e891c34e8d3"
-}
diff --git a/packages/ocaml-windows32/ocaml-windows32.4.14.1/opam b/packages/ocaml-windows32/ocaml-windows32.4.14.1/opam
@@ -30,12 +30,13 @@ conflicts: [
 ]
 synopsis: "OCaml cross-compiler for 32-bit x86 Windows targets"
 extra-files: [
-  ["windows.conf.in" "md5=69f2a64db241a28e172eb316ddd9cef1"]
   ["build.sh" "md5=0c02dc9cf4fa5bb98b8771d22ffd15d9"]
   ["install.sh" "md5=48972538ab93f9a8452af2ddaff38f03"]
-  ["patches/ostype-fix.patch" "md5=05919aebf4e0894bf8f0bc60a6932b46"]
   ["patches/configure.patch" "md5=2947eb1d16daec3d35f769093574249f"]
+  ["patches/ostype-fix.patch" "md5=05919aebf4e0894bf8f0bc60a6932b46"]
   ["patches/windows-append.patch" "md5=524e3cd11717d838d6b7a1bd1e3150cf"]
+  ["remove.sh" "md5=d2ebe7ce54e4a93a4d71d5fd889f17e3"]
+  ["windows.conf.in" "md5=69f2a64db241a28e172eb316ddd9cef1"]
 ]
 url {
   src: "https://github.com/ocaml/ocaml/archive/4.14.1.tar.gz"

diff --git a/packages/ocaml-windows64/ocaml-windows64.4.14.0/opam b/packages/ocaml-windows64/ocaml-windows64.4.14.0/opam
@@ -27,14 +27,15 @@ conflicts: [
   "ocaml-windows32"
 ]
 synopsis: "OCaml cross-compiler for 64-bit x86 Windows targets"
+url {
+  src: "https://github.com/ocaml/ocaml/archive/4.14.0.tar.gz"
+  checksum: "md5=32cfb000312c9d0e2c187e891c34e8d3"
+}
 extra-files: [
-  ["windows.conf.in" "md5=69f2a64db241a28e172eb316ddd9cef1"]
   ["build.sh" "md5=0c02dc9cf4fa5bb98b8771d22ffd15d9"]
   ["install.sh" "md5=0e6b4e3f042e7443f35cfe7a9980e905"]
-  ["patches/ostype-fix.patch" "md5=05919aebf4e0894bf8f0bc60a6932b46"]
   ["patches/configure.patch" "md5=2947eb1d16daec3d35f769093574249f"]
+  ["patches/ostype-fix.patch" "md5=05919aebf4e0894bf8f0bc60a6932b46"]
+  ["remove.sh" "md5=d2ebe7ce54e4a93a4d71d5fd889f17e3"]
+  ["windows.conf.in" "md5=69f2a64db241a28e172eb316ddd9cef1"]
 ]
-url {
-  src: "https://github.com/ocaml/ocaml/archive/4.14.0.tar.gz"
-  checksum: "md5=32cfb000312c9d0e2c187e891c34e8d3"
-}
diff --git a/packages/ocaml-windows64/ocaml-windows64.4.14.1/opam b/packages/ocaml-windows64/ocaml-windows64.4.14.1/opam
@@ -29,12 +29,13 @@ conflicts: [
 ]
 synopsis: "OCaml cross-compiler for 64-bit x86 Windows targets"
 extra-files: [
-  ["windows.conf.in" "md5=69f2a64db241a28e172eb316ddd9cef1"]
   ["build.sh" "md5=0c02dc9cf4fa5bb98b8771d22ffd15d9"]
   ["install.sh" "md5=48972538ab93f9a8452af2ddaff38f03"]
-  ["patches/ostype-fix.patch" "md5=05919aebf4e0894bf8f0bc60a6932b46"]
   ["patches/configure.patch" "md5=2947eb1d16daec3d35f769093574249f"]
+  ["patches/ostype-fix.patch" "md5=05919aebf4e0894bf8f0bc60a6932b46"]
   ["patches/windows-append.patch" "md5=524e3cd11717d838d6b7a1bd1e3150cf"]
+  ["remove.sh" "md5=d2ebe7ce54e4a93a4d71d5fd889f17e3"]
+  ["windows.conf.in" "md5=69f2a64db241a28e172eb316ddd9cef1"]
 ]
 url {
   src: "https://github.com/ocaml/ocaml/archive/4.14.1.tar.gz"

diff --git a/packages/ocaml-windows64/ocaml-windows64.5.1.1/opam b/packages/ocaml-windows64/ocaml-windows64.5.1.1/opam
@@ -29,12 +29,13 @@ conflicts: [
 ]
 synopsis: "OCaml cross-compiler for 64-bit x86 Windows targets"
 extra-files: [
-  ["windows.conf.in" "md5=e3b6250be08dc3a108695b6610bcd7f8"]
   ["build.sh" "md5=3c18095f474f74dc832262fe7f3dd587"]
   ["install.sh" "md5=166b007726c8a1de4a172eb2ae5a4355"]
-  ["patches/ostype-fix.patch" "md5=57404edca01e9a353f28d3b3c0139f55"]
   ["patches/configure.patch" "md5=11532eb26b881d38db59a00341823b99"]
+  ["patches/ostype-fix.patch" "md5=57404edca01e9a353f28d3b3c0139f55"]
   ["patches/windows-append.patch" "md5=137c69d696dc857d663f49df7385923b"]
+  ["remove.sh" "md5=d2ebe7ce54e4a93a4d71d5fd889f17e3"]
+  ["windows.conf.in" "md5=e3b6250be08dc3a108695b6610bcd7f8"]
 ]
 url {
   src: "https://github.com/ocaml/ocaml/archive/5.1.1.tar.gz"

diff --git a/packages/ppx_tools-windows/ppx_tools-windows.5.1+4.06.0/opam b/packages/ppx_tools-windows/ppx_tools-windows.5.1+4.06.0/opam
@@ -25,4 +25,7 @@ flags: light-uninstall
 url {
   src: "https://github.com/ocaml-ppx/ppx_tools/archive/5.1+4.06.0.tar.gz"
   checksum: "md5=6ba2e9690b1f579ba562b86022d1c308"
-}
+}
+extra-files: [
+  "patches/use-ocamlfind.patch" "md5=96b4cdf6fbff8a22458ed57f479e8834"
+]