avoid using patch -R

achartier · achartier · commit 6efd5dadda18 · 2026-03-26T01:24:05.000Z
Signed-off-by: Aurelien Chartier &lt;2567591+achartier@users.noreply.github.com&gt;
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
@@ -62,7 +62,7 @@ foreach(DEP_IDX RANGE ${DEP_COUNT_MINUS_ONE})
       PATCH_COMMAND
       bash
       -c
-      "patch -p1 --batch --dry-run -R -i '${_patch_file}' && echo 'Patch already applied, skipping.' || patch -p1 --forward --batch -i '${_patch_file}'"
+      "patch -p1 --forward --batch --dry-run -i '${_patch_file}' && patch -p1 --forward --batch -i '${_patch_file}' || echo 'Patch already applied, skipping.'"
     )
   endif()
 

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ foreach(DEP_IDX RANGE ${DEP_COUNT_MINUS_ONE})`
`62`	`62`	`PATCH_COMMAND`
`63`	`63`	`bash`
`64`	`64`	`-c`
`65`		`- "patch -p1 --batch --dry-run -R -i '${_patch_file}' && echo 'Patch already applied, skipping.' \|\| patch -p1 --forward --batch -i '${_patch_file}'"`
	`65`	`+ "patch -p1 --forward --batch --dry-run -i '${_patch_file}' && patch -p1 --forward --batch -i '${_patch_file}' \|\| echo 'Patch already applied, skipping.'"`
`66`	`66`	`)`
`67`	`67`	`endif()`
`68`	`68`