Use opatch instead of git apply to patch compiler sources

shym · shym · commit 59f212b51d38 · 2025-10-21T12:20:33.000+02:00
diff --git a/Makefile b/Makefile
@@ -257,7 +257,7 @@ ocaml:
 	cp -r "$$(ocamlfind query ocaml-src)" $@
 	VERSION="$$(head -n1 ocaml/VERSION)" ; \
 	if test -d "patches/$$VERSION" ; then \
-	  git --work-tree=. apply -v --directory=$@ "patches/$$VERSION"/*; \
+	  opatch -v -C $@ "patches/$$VERSION"/*; \
 	fi
 
 # We add $(BLDBIN) inconditionnally, even when using the installed toolchain: as
diff --git a/gen_opams.ml b/gen_opams.ml
@@ -358,7 +358,7 @@ depends: [
   "ocaml-unikraft-toolchain-%s"
   "ocamlfind"
   "ocaml-src" {build}
-  "conf-git" {build}
+  "opatch" {build}
 ]
 build: [
   [
diff --git a/ocaml-unikraft-arm64.opam b/ocaml-unikraft-arm64.opam
@@ -17,7 +17,7 @@ depends: [
   "ocaml-unikraft-toolchain-arm64"
   "ocamlfind"
   "ocaml-src" {build}
-  "conf-git" {build}
+  "opatch" {build}
 ]
 build: [
   [
diff --git a/ocaml-unikraft-x86_64.opam b/ocaml-unikraft-x86_64.opam
@@ -17,7 +17,7 @@ depends: [
   "ocaml-unikraft-toolchain-x86_64"
   "ocamlfind"
   "ocaml-src" {build}
-  "conf-git" {build}
+  "opatch" {build}
 ]
 build: [
   [

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ depends: [`
`17`	`17`	`"ocaml-unikraft-toolchain-arm64"`
`18`	`18`	`"ocamlfind"`
`19`	`19`	`"ocaml-src" {build}`
`20`		`- "conf-git" {build}`
	`20`	`+ "opatch" {build}`
`21`	`21`	`]`
`22`	`22`	`build: [`
`23`	`23`	`[`