fgerlits commented on a change in pull request #1104:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1104#discussion_r649470530
##########
File path: cmake/BundledAzureSdkCpp.cmake
##########
@@ -16,8 +16,13 @@
# under the License.
function(use_bundled_libazure SOURCE_DIR BINARY_DIR)
- set(PATCH_FILE
"${SOURCE_DIR}/thirdparty/azure-sdk-cpp-for-cpp/azure-sdk-for-cpp-old-compiler.patch")
- set(PC "${Patch_EXECUTABLE}" -R -p1 -s -f --dry-run -i "${PATCH_FILE}" ||
"${Patch_EXECUTABLE}" -p1 -i "${PATCH_FILE}")
+ set(PATCH_FILE1
"${SOURCE_DIR}/thirdparty/azure-sdk-cpp-for-cpp/azure-sdk-for-cpp-old-compiler.patch")
+ set(PATCH_FILE2
"${SOURCE_DIR}/thirdparty/azure-sdk-cpp-for-cpp/fix-illegal-qualified-name-in-member.patch")
+ set(PC bash -c "set -x && (\"${Patch_EXECUTABLE}\" -p1 -N -i
\"${PATCH_FILE1}\" &&\
+ \"${Patch_EXECUTABLE}\" -p1 -N -i \"${PATCH_FILE2}\") ||\
+ (\"${Patch_EXECUTABLE}\" -p1 -R --dry-run -i \"${PATCH_FILE1}\" &&\
+ \"${Patch_EXECUTABLE}\" -p1 -R --dry-run -i \"${PATCH_FILE2}\")")
Review comment:
Having read it a sixth time, they're not logically the same: if patch1
has already been applied but patch2 hasn't, then
- the version in
https://github.com/apache/nifi-minifi-cpp/pull/1104/commits/56ec54bc0626ed56648464ac35c99e289a2dcd51
will not try to apply patch2, and result in an error
- the version in
https://github.com/apache/nifi-minifi-cpp/pull/1104/commits/6762d136fe4dbcd44296933587cf6d1e748d20ba
will skip patch1 and apply patch2, and result in success.
So it's not just a readability improvement.
--
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]
