Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

boost submodule #11265

Closed
wants to merge 4 commits into from
Closed

boost submodule #11265

wants to merge 4 commits into from

Conversation

liewegas
Copy link
Member

No description provided.

@liewegas liewegas mentioned this pull request Sep 29, 2016
Closed
cbodley
cbodley reviewed Sep 29, 2016
View reviewed changes
do_cmake.sh
@@ -6,7 +6,7 @@ if test -e build; then
fi
mkdir build
cd build
cmake $@ ..
cmake BOOST_J=$(nproc) $@ ..
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think the BOOST_J= should be -DBOOST_J=

@liewegas liewegas force-pushed the wip-boost branch 3 times, most recently from 2743b43 to 813e958 Compare October 4, 2016 20:32
@liewegas liewegas modified the milestone: kraken Oct 4, 2016
@liewegas liewegas closed this Oct 18, 2016
@liewegas liewegas deleted the wip-boost branch October 18, 2016 13:30
@liewegas liewegas restored the wip-boost branch October 21, 2016 19:14
@liewegas liewegas reopened this Oct 21, 2016
mattbenjamin and others added 4 commits October 21, 2016 15:18
@mattbenjamin @liewegas
boost: add submodule at tag boost-1.61.0
daa8aeb 
This implements option #4 for external boost, based on upstream
discussion.  In option #4:

1. boost is added as a submodule
2. builds default to using the attached boost module
3. building against a system-provided boost is supported, but
   must be configured explicitly

Because all of the boost components are attached as nested
submodules in the upstream boost repository, neither the nested
submodules nor the root boost submodule have been cloned into
modules in github.com/ceph (acked by Sage).

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
@mattbenjamin @liewegas
cmake: find and build bundled boost
1a4f811 
Build Boost using the src/boost submodule, unless overridden
by -DWITH_SYSTEM_BOOST.

If -DBOOST_J=<n> is provided, builds Boost with <n> jobs.

Boost builds in the configured Build directory.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
@mattbenjamin @liewegas
boost: update boost to 8/29
21661b3 
Pull-up Boost to the commit which merged the upstream fix for
upstream Boost/iostreams bug #11860 (template arity warnings),
per discussion in core.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
@liewegas
do_cmake.sh: set BOOST_J to $(nproc)
99405b9 
This lets us build boost with all processors.

Signed-off-by: Sage Weil <sage@redhat.com>
@yuriw
Copy link
Contributor

yuriw commented Oct 24, 2016 •
edited

@liewegas I had problem running tests with this PR

[yuriw@smithi018 build]$ git pull https://github.com/liewegas/ceph.git wip-denc
From https://github.com/liewegas/ceph
 * branch            wip-denc   -> FETCH_HEAD
Auto-merging src/os/bluestore/bluestore_types.h
CONFLICT (content): Merge conflict in src/os/bluestore/bluestore_types.h
Auto-merging src/os/bluestore/BlueStore.h
Auto-merging src/os/bluestore/BlueStore.cc
CONFLICT (content): Merge conflict in src/os/bluestore/BlueStore.cc
Auto-merging src/os/bluestore/BlueFS.cc
Automatic merge failed; fix conflicts and then commit the result.

And build failed http://gitbuilder.sepia.ceph.com/gitbuilder-ceph-rpm-centos7-amd64-basic/log.cgi?log=036984ad235166b1c46c1dc39e2650aba343090c

@mattbenjamin
Copy link
Contributor

@liewegas, @yuriw the first thing I've hit on centos7 is a conflict w/ceph manager boost check, fixing that, then moving on...

@mattbenjamin
Copy link
Contributor

Wrt the actual build failure, it looks as if this CMake (2.8.10) CHECK_INCLUDE_FILES_CXX is behaving differently; the proximate cause of failure is a failed check for boost/asio/coroutine.hpp, which does exist.

Also we need to add python to the list of boost libs being bootstrapped. I'm inclined to just do that unconditionally. I'll check actual build with -DCEPH_MGR=ON.

I think I'll need to create a branch with additional commits and mention it here.

@yuriw
Copy link
Contributor

yuriw commented Oct 26, 2016

@mattbenjamin thanks, shall we remove needs-qa tag meanwhile?`

@liewegas
Copy link
Member Author

liewegas commented Nov 7, 2016

#11817

@liewegas liewegas closed this Nov 7, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cbodley cbodley cbodley left review comments

Assignees
No one assigned
Labels
build/ops core needs-qa
Projects
None yet
Milestone
kraken
4 participants
@liewegas @yuriw @mattbenjamin @cbodley