diff options
author | Jianpeng Ma <jianpeng.ma@intel.com> | 2018-05-16 11:51:42 +0200 |
---|---|---|
committer | Jianpeng Ma <jianpeng.ma@intel.com> | 2018-05-16 11:56:20 +0200 |
commit | 56ce1b793c0011a0de5e8384b3a33f8af845c6bb (patch) | |
tree | 750f5a5f77c370428e76dd3feb4424bf09cf7841 /cmake | |
parent | Merge pull request #22008 from dillaman/wip-rbd-suite-distros (diff) | |
download | ceph-56ce1b793c0011a0de5e8384b3a33f8af845c6bb.tar.xz ceph-56ce1b793c0011a0de5e8384b3a33f8af845c6bb.zip |
cmake: update fio version from 3.5 to 540e235dcd276e63c57.
Fio commit(d04f1d5b342e7733) make external ioengine work.
This need when build libfio_ceph_objectstore.so.
Meanwhile fix a comiler error:
/home/ceph/src/test/fio/fio_ceph_objectstore.cc: In constructor ‘{anonymous}::ceph_ioengine::ceph_ioengine()’:
/home/ceph/src/test/fio/fio_ceph_objectstore.cc:733:19: error: invalid conversion from ‘int (*)(thread_data*, io_u*)’ to ‘fio_q_status (*)(thread_data*, io_u*)’ [-fpermissive]
queue = fio_ceph_os_queue;
^~~~~~~~~~~~~~~~~
src/test/fio/CMakeFiles/fio_ceph_objectstore.dir/build.make:62: recipe for target 'src/test/fio/CMakeFiles/fio_ceph_objectstore.dir/fio_ceph_objectstore.cc.o' failed
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/modules/BuildFIO.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/modules/BuildFIO.cmake b/cmake/modules/BuildFIO.cmake index 973063e002f..fb504f4ab9d 100644 --- a/cmake/modules/BuildFIO.cmake +++ b/cmake/modules/BuildFIO.cmake @@ -6,7 +6,7 @@ function(build_fio) DOWNLOAD_DIR ${CMAKE_BINARY_DIR}/src/ UPDATE_COMMAND "" # this disables rebuild on each run GIT_REPOSITORY "https://github.com/axboe/fio.git" - GIT_TAG "fio-3.5" + GIT_TAG "540e235dcd276e63c57ca4bd35f70a0651e2d00e" SOURCE_DIR ${CMAKE_BINARY_DIR}/src/fio BUILD_IN_SOURCE 1 CONFIGURE_COMMAND <SOURCE_DIR>/configure |