cmake: replace civetweb symlink w/file copy #11900
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cbodley
reviewed
Nov 10, 2016
| #COMMAND rm -f "${CMAKE_BINARY_DIR}/src/include/civetweb" | ||
| #COMMAND mkdir -p "${CMAKE_BINARY_DIR}/src/include" | ||
| #COMMAND ln -s "${CMAKE_SOURCE_DIR}/src/civetweb/include" | ||
| # "${CMAKE_BINARY_DIR}/src/include/civetweb") |
There was a problem hiding this comment.
can you remove instead of commenting out?
There was a problem hiding this comment.
that wasn't the intention
Intended to remove an apparent race. The two effects are 1. replace top-level command callouts w/file builtins 2. do them in the src/rgw sub-cmake This is cleaner, and ideally avoids the race. Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
mattbenjamin
force-pushed
the
fix-civetweb-link
branch
from
b520c38
to
d9e5ad5
Compare
liewegas
approved these changes
Nov 10, 2016
|
@liewegas build failure looks spurious, is in make check as recently: Total Test time (real) = 310.19 sec The following tests FAILED: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Intended to remove an apparent race. The two effects are
This is cleaner, and ideally avoids the race.
Signed-off-by: Matt Benjamin mbenjamin@redhat.com