Support flexdll 0.43/0.44 vendor-supplied patches

Remove the Win64 ARM64 flexdll cross-compiling patches as flexdll does
not yet support ARM64. Only keep it for a hypothetical 0.99 version.

Author: jonahbeckford

CHANGES.md

@@ -2,6 +2,13 @@
 
 ## Pending
 
+* Support vendor-supplied patches for flexdll 0.43 and unreleased 0.44. Patches are
+  now relative to ocaml parent directory so all `git am` based patches are of form
+  `flexdll/flexdll.c`, etc. to make robust to the lack of `flexdll/.git`.
+   Vendor supplied patches are used by DkSDK CMake's `110-ocaml-lang`.
+
+## 2.1.3
+
 * Backport from 5.2.0 of [Linear computation of closure environments](https://github.com/ocaml/ocaml/pull/12222)
   to fix performance bug <https://discuss.ocaml.org/t/scaling-factors-when-compiling-mutually-recursive-definitions/14708>
 

src/p/flexdll-cross-0_42-a01-arm64.patch

@@ -1,7 +1,7 @@
-diff --git a/flexdll.c b/flexdll.c
+diff --git a/flexdll/flexdll.c b/flexdll/flexdll.c
 index b19fe2a..bcc922d 100644
---- a/flexdll.c
-+++ b/flexdll.c
+--- a/flexdll/flexdll.c
++++ b/flexdll/flexdll.c
 @@ -16,9 +16,9 @@
 
  /* Guard against compiling with the wrong cl! */

src/p/flexdll-cross-0_39-a01-arm64.patch renamed to src/p/flexdll-cross-0_99-a01-arm64.patch

@@ -466,7 +466,7 @@ set_ocaml_version_stems() {
         4.*) VERSION_STEMS+=("4") ;;
         5.*) VERSION_STEMS+=("5") ;;
         *)
-            echo "FATAL: Unsupported stemming case 1 for version $set_version_stems_VER" >&2
+            echo "FATAL: Unsupported stemming case 1 for ocaml version $set_version_stems_VER" >&2
             exit 123
             ;;
     esac
@@ -480,16 +480,17 @@ set_ocaml_version_stems() {
         5.1.*) VERSION_STEMS+=("5_1") ;;
         5.2.*) VERSION_STEMS+=("5_2") ;;
         *)
-            echo "FATAL: Unsupported stemming case 2 for version $set_version_stems_VER" >&2
+            echo "FATAL: Unsupported stemming case 2 for ocaml version $set_version_stems_VER" >&2
             exit 123
             ;;
     esac
     case "$set_version_stems_VER" in
         4.14.0) VERSION_STEMS+=("4_14_0") ;;
         4.14.1) VERSION_STEMS+=("4_14_1") ;;
         4.14.2) VERSION_STEMS+=("4_14_2") ;;
+        4.14.3) VERSION_STEMS+=("4_14_3") ;;
         *)
-            echo "FATAL: Unsupported stemming case 3 for version $set_version_stems_VER" >&2
+            echo "FATAL: Unsupported stemming case 3 for ocaml version $set_version_stems_VER" >&2
             exit 123
             ;;
     esac
@@ -500,12 +501,20 @@ set_flexdll_version_stems() {
     VERSION_STEMS=()
     case "$set_version_stems_VER" in
         0.*) VERSION_STEMS+=("0") ;;
+        *)
+            echo "FATAL: Unsupported stemming case 1 for flexdll version $set_version_stems_VER" >&2
+            exit 123
+            ;;
     esac
     case "$set_version_stems_VER" in
         0.39) VERSION_STEMS+=("0_39") ;;
-    esac
-    case "$set_version_stems_VER" in
         0.42) VERSION_STEMS+=("0_42") ;;
+        0.43) VERSION_STEMS+=("0_43") ;;
+        0.44) VERSION_STEMS+=("0_44") ;;
+        *)
+            echo "FATAL: Unsupported stemming case 2 for flexdll version $set_version_stems_VER" >&2
+            exit 123
+            ;;
     esac
 }
 # Sets the array PATCHES and accumulates dkmldir/ relative paths, including
@@ -799,9 +808,9 @@ BUILD_HOST_ARGS+=( -s "$_OCAMLVER" )
 BUILD_CROSS_ARGS+=( -s "$_OCAMLVER" )
 
 # Find and apply patches to the host ABI
-apply_patches "$OCAMLSRC_UNIX"          ocaml    "$_OCAMLVER"    host
+apply_patches "$OCAMLSRC_UNIX"      ocaml    "$_OCAMLVER"    host
 if [ -e "$OCAMLSRC_UNIX"/flexdll/Makefile ] && is_unixy_windows_build_machine; then
-    apply_patches "$OCAMLSRC_UNIX/flexdll"  flexdll  "$_FLEXDLLVER"  host
+    apply_patches "$OCAMLSRC_UNIX"  flexdll  "$_FLEXDLLVER"  host
 fi
 
 if [ -z "$TARGETABIS" ]; then