From c8a95779da6c0e444d4606d6d001098fc00d4b2d Mon Sep 17 00:00:00 2001 From: Calascibetta Romain Date: Fri, 19 Sep 2025 12:46:11 +0200 Subject: [PATCH 1/2] Show up for logs how we apply patches when we install ocaml-solo5 via opam --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8170d8af..69be7f02 100644 --- a/Makefile +++ b/Makefile @@ -100,7 +100,10 @@ ocaml: cp -r "$$(ocamlfind query ocaml-src)" $@ VERSION="$$(head -n1 ocaml/VERSION)" ; \ if test -d "patches/$$VERSION" ; then \ - git apply --directory=$@ "patches/$$VERSION"/*; \ + for p in "patches/$$VERSION"/*; do \ + ( set -x ; git apply -v --directory=$@ "$$p" \ + ; echo " PATCH $$p: $$?") ; \ + done ; \ fi ocaml/Makefile.config: $(LIBS) $(TOOLCHAIN_FOR_BUILD) | ocaml From 5f3d16c1c1afff1649cb29da15246274dde7c6b2 Mon Sep 17 00:00:00 2001 From: Calascibetta Romain Date: Fri, 19 Sep 2025 13:55:29 +0200 Subject: [PATCH 2/2] Add git init -q as we did for esperanto --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 69be7f02..ecf0b7d7 100644 --- a/Makefile +++ b/Makefile @@ -100,6 +100,7 @@ ocaml: cp -r "$$(ocamlfind query ocaml-src)" $@ VERSION="$$(head -n1 ocaml/VERSION)" ; \ if test -d "patches/$$VERSION" ; then \ + git init -q && \ for p in "patches/$$VERSION"/*; do \ ( set -x ; git apply -v --directory=$@ "$$p" \ ; echo " PATCH $$p: $$?") ; \