Skip to content

Add an opatch command and use it instead of git apply #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hannesm merged 2 commits into from
Nov 19, 2025
Merged

Add an opatch command and use it instead of git apply #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
980a25a
Regenerate patches in plain text diff
shym Sep 25, 2025
252bb37
Use `opatch` instead of `git apply`
shym Oct 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ ocaml:
cp -r "$$(ocamlfind query ocaml-src)" $@
VERSION="$$(head -n1 ocaml/VERSION)" ; \
if test -d "patches/$$VERSION" ; then \
git apply --directory=$@ "patches/$$VERSION"/*; \
opatch -v -C $@ "patches/$$VERSION"/*; \
fi

ocaml/Makefile.config: $(LIBS) $(TOOLCHAIN_FOR_BUILD) | ocaml
Expand Down
2 changes: 1 addition & 1 deletion ocaml-solo5-cross-aarch64.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ run-test: [
[make "test"]
]
depends: [
"conf-git" {build} # to patch the compiler sources
"opatch" {build} # to patch the compiler sources
"ocamlfind" {build}
"ocaml-src" {build}
"ocaml" {= "5.3.0"}
Expand Down
2 changes: 1 addition & 1 deletion ocaml-solo5.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ run-test: [
[make "test"]
]
depends: [
"conf-git" {build} # to patch the compiler sources
"opatch" {build} # to patch the compiler sources
"ocamlfind" {build}
"ocaml-src" {build}
"ocaml" {= "5.3.0"}
Expand Down
Loading