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

cmake: librbd cleanup #11842

Merged
merged 3 commits into from Nov 14, 2016
Merged

cmake: librbd cleanup #11842

merged 3 commits into from Nov 14, 2016

Conversation

tchaikov
Copy link
Contributor

@tchaikov tchaikov commented Nov 9, 2016

No description provided.

@dillaman
Copy link

dillaman commented Nov 9, 2016

lgtm

@dillaman
Copy link

Not sure if this is related, but going to pull this PR from my branch and attempt a rebuild:
http://gitbuilder.sepia.ceph.com/gitbuilder-ceph-deb-jessie-amd64-basic/log.cgi?log=d1a162e6c065b105eb386657751b9a15e62b6ef7

@tchaikov
Copy link
Contributor Author 

cd "/srv/autobuild-ceph/gitbuilder.git/build/out~/ceph-11.0.2-1391-gd1a162e/src/pybind/rbd" && env CC=" /usr/bin/cc" CXX=" /usr/bin/c++" LDSHARED=" /usr/bin/cc -shared" OPT="-DNDEBUG -g -fwrapv -O2 -Wall" LDFLAGS=-L/srv/autobuild-ceph/gitbuilder.git/build/out~/ceph-11.0.2-1391-gd1a162e/obj-x86_64-linux-gnu/lib CYTHON_BUILD_DIR=/srv/autobuild-ceph/gitbuilder.git/build/out~/ceph-11.0.2-1391-gd1a162e/obj-x86_64-linux-gnu/src/pybind/rbd3 CEPH_LIBDIR=/srv/autobuild-ceph/gitbuilder.git/build/out~/ceph-11.0.2-1391-gd1a162e/obj-x86_64-linux-gnu/lib CFLAGS="-iquote/srv/autobuild-ceph/gitbuilder.git/build/out~/ceph-11.0.2-1391-gd1a162e/src/include" /usr/bin/python3 /srv/autobuild-ceph/gitbuilder.git/build/out~/ceph-11.0.2-1391-gd1a162e/src/pybind/rbd/setup.py build --verbose --build-base /srv/autobuild-ceph/gitbuilder.git/build/out~/ceph-11.0.2-1391-gd1a162e/obj-x86_64-linux-gnu/lib/cython_modules --build-platlib /srv/autobuild-ceph/gitbuilder.git/build/out~/ceph-11.0.2-1391-gd1a162e/obj-x86_64-linux-gnu/lib/cython_modules/lib.3
/srv/autobuild-ceph/gitbuilder.git/build/out~/ceph-11.0.2-1391-gd1a162e/obj-x86_64-linux-gnu/lib/librbd.so: undefined reference to `ceph_str_hash_linux(char const*, unsigned int)'
/srv/autobuild-ceph/gitbuilder.git/build/out~/ceph-11.0.2-1391-gd1a162e/obj-x86_64-linux-gnu/lib/librbd.so: undefined reference to `ceph::time_detail::real_clock::now(CephContext const*)'
error: collect2: ld returned 1 exit status
Error: Link RBD library not found
src/pybind/rbd3/CMakeFiles/cython3_rbd.dir/build.make:52: recipe for target 'src/pybind/rbd3/CMakeFiles/cython3_rbd' failed
make[4]: *** [src/pybind/rbd3/CMakeFiles/cython3_rbd] Error 1

@tchaikov tchaikov changed the title cmake: librbd cleanup [DNM] cmake: librbd cleanup Nov 12, 2016
@tchaikov
cmake: let rbd_internal depend on librbd-tp
89d6091 
as librbd/AioCompletion.cc includes "tracing/librbd.h", which is offered
by librbd-tp.

Signed-off-by: Kefu Chai <kchai@redhat.com>
@tchaikov
cmake: move ContextCompletion.cc into rbd_internal
9f8a311 
- ContextCompletion.cc is used by TrimRequest.cc which is included by
  rbd_internal, it's more natural to put ContextCompletion.cc into
  rbd_internal also. as rbd_internal is the only consumer of this
  translation unit.
- librbd/internal.cc is not referencing any symbols from util.cc, so
  remove this include. and also, do not add
  $<TARGET_OBJECTS:common_util_obj> to librbd.

Signed-off-by: Kefu Chai <kchai@redhat.com>
@tchaikov
cmake:librbd: move common to the end of linked libraries
8eb2c9d 
so the linked libraries are able to find the symbols in libcommon.
and do not `list(APPEND librbd ...)` anymore, which is wrong and not
necessary. librbd does not depends on krbd.

Signed-off-by: Kefu Chai <kchai@redhat.com>
@tchaikov
Copy link
Contributor Author

fixed and re-pushed to ceph/ceph:wip-cmake.

dillaman
dillaman approved these changes Nov 14, 2016
View reviewed changes
Copy link

@dillaman dillaman left a comment

Choose a reason for hiding this comment

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

lgtm

@tchaikov tchaikov changed the title [DNM] cmake: librbd cleanup cmake: librbd cleanup Nov 14, 2016
@tchaikov tchaikov merged commit eb8b4c8 into master Nov 14, 2016
@tchaikov tchaikov deleted the wip-cmake branch November 14, 2016 14:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dillaman dillaman dillaman approved these changes

Assignees
No one assigned
Labels
build/ops cleanup rbd
Projects
None yet
Milestone
No milestone
3 participants
@tchaikov @dillaman @alimaredia