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.

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

cmake: fix the build with -DWITH_ZFS=ON #15907

Merged
merged 2 commits into from Jun 28, 2017

Conversation

Projects
None yet
3 participants
@tchaikov
Contributor

tchaikov commented Jun 26, 2017

No description provided.

os/ZFS: make it compilable
* `cct` is not globally avaiable, use cct() wrapper instead
* libzfs.h is always avaiable here. so remove the guard

Signed-off-by: Kefu Chai <kchai@redhat.com>
@tchaikov

This comment has been minimized.

Contributor

tchaikov commented Jun 26, 2017

i understand we are moving to bluestore. but IMO, as long as we support WITH_ZFS/HAVE_ZFS, it should be at least compilable.

@tchaikov tchaikov changed the title from cmake: fix the WITH_ZFS option to cmake: fix the build with -DWITH_ZFS=ON Jun 26, 2017

@wjwithagen

@tchaikov
Finding libzfs is a rather complex thingy on FreeBSD because it does not get installed into /usr/include.
Suggestions to that end have been done, but not executed. So I guess it needs to be extracted from the source tree.

@tchaikov

This comment has been minimized.

Contributor

tchaikov commented Jun 26, 2017

@wjwithagen do you have any suggestion w.r.t. this patch? shall we search for the header/library in /usr/local instead?

wjwithagen added a commit to wjwithagen/ceph that referenced this pull request Jun 26, 2017

CMakeLists.txt: Rewrite 2 remaning options to WITH_
All options to en/disable inclusion of libraries or other software
are of the format WITH_ so that the Cmake commaind like ahs all
WITH_* options. The WITH_=ON option will result in a HAVE_ setting
in CMAKE so that tests can use that variable.

Last "abusers" to actually follow this format.

 - HAVE_BABELTRACE

 - HAVE_ZFSLIB is fixed in ceph#15907

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>

@tchaikov tchaikov added the needs-qa label Jun 26, 2017

cmake: compile libzfs backend conditionally
* do not REQUIRE libzfs if it is enabled, this follows the way how we
  handle `WITH_XFS` option.
* also refactor the cmake script related to libxfs backend support a
  little bit.

Signed-off-by: Kefu Chai <kchai@redhat.com>

@tchaikov tchaikov merged commit bebce62 into ceph:master Jun 28, 2017

4 checks passed

Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
default Build finished.
Details
make check make check succeeded
Details

@tchaikov tchaikov deleted the tchaikov:wip-with-zfs branch Jun 28, 2017

@wjwithagen

This comment has been minimized.

Contributor

wjwithagen commented Jun 29, 2017

@tchaikov
Been busy with another nagging problem...
So I've been not watching Ceph as closely. For the time being this is fine.
I'll put it on the ToDo, and it'll pop up when its time is there.

wjwithagen added a commit to wjwithagen/ceph that referenced this pull request Jul 2, 2017

CMakeLists.txt: Rewrite 2 remaning options to WITH_
All options to en/disable inclusion of libraries or other software
are of the format WITH_ so that the Cmake commaind like ahs all
WITH_* options. The WITH_=ON option will result in a HAVE_ setting
in CMAKE so that tests can use that variable.

Last "abusers" to actually follow this format.

 - HAVE_BABELTRACE

 - HAVE_ZFSLIB is fixed in ceph#15907

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>

dingdangzhang added a commit to dingdangzhang/ceph that referenced this pull request Jul 12, 2017

CMakeLists.txt: Rewrite 2 remaning options to WITH_
All options to en/disable inclusion of libraries or other software
are of the format WITH_ so that the Cmake commaind like ahs all
WITH_* options. The WITH_=ON option will result in a HAVE_ setting
in CMAKE so that tests can use that variable.

Last "abusers" to actually follow this format.

 - HAVE_BABELTRACE

 - HAVE_ZFSLIB is fixed in ceph#15907

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment