Add --binary flag to patch command. (#9941)

jonsimantov · web-flow · commit 6c8a0107b307 · 2022-06-23T16:04:26.000-07:00
Certain versions of the 'patch' command on Windows have an issue with CRLF line endings.
Adding the --binary flag is a no-op on POSIX systems, but should fix patch.exe crashing on Windows.
diff --git a/cmake/external/snappy.cmake b/cmake/external/snappy.cmake
@@ -34,7 +34,7 @@ ExternalProject_Add(
   BUILD_COMMAND     ""
   INSTALL_COMMAND   ""
   TEST_COMMAND      ""
-  PATCH_COMMAND     patch -Np1 -i ${CMAKE_CURRENT_LIST_DIR}/snappy.patch
+  PATCH_COMMAND     patch -Np1 --binary -i ${CMAKE_CURRENT_LIST_DIR}/snappy.patch
 
   HTTP_HEADER "${EXTERNAL_PROJECT_HTTP_HEADER}"
 )

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ ExternalProject_Add(`
`34`	`34`	`BUILD_COMMAND ""`
`35`	`35`	`INSTALL_COMMAND ""`
`36`	`36`	`TEST_COMMAND ""`
`37`		`- PATCH_COMMAND patch -Np1 -i ${CMAKE_CURRENT_LIST_DIR}/snappy.patch`
	`37`	`+ PATCH_COMMAND patch -Np1 --binary -i ${CMAKE_CURRENT_LIST_DIR}/snappy.patch`
`38`	`38`
`39`	`39`	`HTTP_HEADER "${EXTERNAL_PROJECT_HTTP_HEADER}"`
`40`	`40`	`)`