fgerlits commented on a change in pull request #973:
URL: https://github.com/apache/nifi-minifi-cpp/pull/973#discussion_r558012683
##########
File path: cmake/BundledOSSPUUID.cmake
##########
@@ -21,8 +21,8 @@ function(use_bundled_osspuuid SOURCE_DIR BINARY_DIR)
message("Using bundled ossp-uuid")
# Define patch step
- set(PC "${Patch_EXECUTABLE}" -p1 -i
"${SOURCE_DIR}/thirdparty/ossp-uuid/ossp-uuid-mac-fix.patch" &&
- "${Patch_EXECUTABLE}" -p1 -i
"${SOURCE_DIR}/thirdparty/ossp-uuid/ossp-uuid-no-prog.patch")
+ set(PC "${Patch_EXECUTABLE}" -p1 -N -r- -i
"${SOURCE_DIR}/thirdparty/ossp-uuid/ossp-uuid-mac-fix.patch" &&
+ "${Patch_EXECUTABLE}" -p1 -N -r- -i
"${SOURCE_DIR}/thirdparty/ossp-uuid/ossp-uuid-no-prog.patch" || :)
Review comment:
I'm OK with a change that ignores "already applied" errors only and not
all errors. I would also be OK with reverting this part of the change, so we
just live with the "already applied" errors until we figure out how to fix them
properly.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
