From bfa86fcc5187bf71080d5f934ff147cdbb64a9e1 Mon Sep 17 00:00:00 2001 From: Mark Elvers Date: Tue, 18 Jun 2024 15:55:46 +0000 Subject: [PATCH 1/2] Change caml.inria.fr to github.com --- shell/bootstrap-ocaml.sh | 6 +++--- src_ext/Makefile | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/shell/bootstrap-ocaml.sh b/shell/bootstrap-ocaml.sh index 8b77e21e588..02c5f018001 100755 --- 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 index 84f03290422..419a8d6ee60 100644 --- 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 From 7352cfbb5da250d1d7d5e6a4a0c013eddd990b82 Mon Sep 17 00:00:00 2001 From: Mark Elvers Date: Tue, 18 Jun 2024 16:18:55 +0000 Subject: [PATCH 2/2] Update master_changes.md --- master_changes.md | 1 + 1 file changed, 1 insertion(+) diff --git a/master_changes.md b/master_changes.md index 90c3a1f3acf..39d483067e6 100644 --- a/master_changes.md +++ b/master_changes.md @@ -70,6 +70,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