diff --git a/CHANGES.md b/CHANGES.md index c405b04..8073e31 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,6 +2,10 @@ ## Pending +* Support vendor-supplied patches for flexdll 0.43 and (unreleased) 0.44. 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 diff --git a/src/r-c-ocaml-1-setup.sh b/src/r-c-ocaml-1-setup.sh index 37cc507..805695d 100755 --- a/src/r-c-ocaml-1-setup.sh +++ b/src/r-c-ocaml-1-setup.sh @@ -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,7 +480,7 @@ 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 @@ -488,8 +488,9 @@ set_ocaml_version_stems() { 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