Make vstart work with cmake out of tree builds #5457
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
jcsp
changed the title
|
I pushed updates to fix that first failure from loic-bot (it hasn't rebuilt though?). It's building on gitbuilders though. |
|
@tchaikov since you were interested in the last cmake PR I wonder if you would have time to review this one too? |
|
oops, never mind, you already commented on one of the commits here |
|
@jcsp i ran into this problem: did you have the same issue here or how did you work around it? |
|
I posted a fix to build isa with cmake #5500 and |
| # Gather symlinks to EC plugins in one dir, because with CMake they | ||
| # are built into multiple locations | ||
| mkdir -p ec_plugins | ||
| for file in ./src/erasure-code/jerasure/*.so* src/erasure-code/lrc/*.so* |
There was a problem hiding this comment.
can we simply put:
for file in src/erasure-code/*/libec_*.so*;instead of enumerating all the erasure plugin directories?
since, with the fix (oritwas@ed2fdd9) by @oritwas and probably future erasure plugins, we need always keep this file in sync.
There was a problem hiding this comment.
Yep, sounds sensible -- done.
|
@oritwas thanks, |
added 8 commits
August 10, 2015 14:05
...instead of in src/test/dencoder. While the source lives in test/, the dencoder tool is built and distributed as a first class binary, so it's awkward for paths in dev/test to have it in a unique location. Signed-off-by: John Spray <john.spray@redhat.com>
Scripts expect the generated init-ceph script to be +x, and CMake does that if the file you feed into it is +x. This matches what we already do with ceph.in. Signed-off-by: John Spray <john.spray@redhat.com>
Avoid need for separate ceph.in and ceph.in.cmake files. Signed-off-by: John Spray <john.spray@redhat.com>
A little bit more of a tongue-twisting command line to do string replacement, but saves us from having separate ceph.in files for cmake vs autotools. Signed-off-by: John Spray <john.spray@redhat.com>
...for working with out-of-tree builds. Signed-off-by: John Spray <john.spray@redhat.com>
Signed-off-by: John Spray <john.spray@redhat.com>
a la what we currently do for PYTHONPATH and LD_LIBRARY_PATH, but for cmake out of tree builds. Signed-off-by: John Spray <john.spray@redhat.com>
...for the benefit of rbd. Signed-off-by: John Spray <john.spray@redhat.com>
|
@jcsp it looks great! will give it a spin. |
|
works , thanks |
tchaikov
added a commit
that referenced
this pull request
Aug 11, 2015
Make vstart work with cmake out of tree builds Reviewed-by: Kefu Chai <kchai@redhat.com>
|
works for me also. thanks. |
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.
No description provided.