Merge pull request #6032 from mtelvers/inria-patch

Patch to move from caml.inria.fr to gitHub.com
ocaml · Jun 19, 2024 · 62b041a · 62b041a
2 parents 503a636 + 7352cfb
commit 62b041a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/master_changes.md b/master_changes.md
@@ -72,6 +72,7 @@ users)
 
 ## Build
   * Fix the lower-bound constraint on ocaml-re (bump from >= 1.9.0 to >= 1.10.0) [#6016 @kit-ty-kate]
+  * Update source file location as caml.inria.fr is unavailable [#6032 @mtelvers]
 
 ## Infrastructure
 

diff --git a/shell/bootstrap-ocaml.sh b/shell/bootstrap-ocaml.sh
@@ -39,9 +39,9 @@ fi
 if [ ${GEN_CONFIG_ONLY} -eq 0 ] ; then
   tar -zxf ${V}.tar.gz
 else
-  mkdir -p ${V}
+  mkdir -p ocaml-${V}
 fi
-cd ${V}
+cd ocaml-${V}
 PATH_PREPEND=
 LIB_PREPEND=
 INC_PREPEND=
@@ -130,7 +130,7 @@ if [ -n "$1" -a -n "${COMSPEC}" -a -x "${COMSPEC}" ] ; then
   if [ ! -e ${FLEXDLL} ]; then
     cp $BOOTSTRAP_ROOT/src_ext/archives/${FLEXDLL} . 2>/dev/null || ${CURL} ${FV_URL}
   fi
-  cd ${V}
+  cd ocaml-${V}
   PREFIX=`cd .. ; pwd`/ocaml
   WINPREFIX=`echo ${PREFIX} | cygpath -f - -m`
   if [ ${GEN_CONFIG_ONLY} -eq 0 ] ; then

diff --git a/src_ext/Makefile b/src_ext/Makefile
@@ -8,8 +8,8 @@ endif
 
 PATCH ?= patch
 
-URL_ocaml = https://caml.inria.fr/pub/distrib/ocaml-4.14/ocaml-4.14.2.tar.gz
-MD5_ocaml = f2fa20be4eea01f837b3556ff282d9b0
+URL_ocaml = https://github.com/ocaml/ocaml/archive/4.14.2.tar.gz
+MD5_ocaml = b28daefda803b5d5910cecf085b1451c
 
 URL_flexdll = https://github.com/ocaml/flexdll/archive/0.43.tar.gz
 MD5_flexdll = 6ce706f6c65b2c5adf5791fac678f090