From: Kefu Chai Date: Sat, 14 Aug 2021 01:47:36 +0000 (+0800) Subject: cmake/modules/BuildFIO: use ceph fork X-Git-Tag: v17.1.0~1115^2~2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=10baab3fc8293b8c30ca90a4acd76f70d011f1b5;p=ceph.git cmake/modules/BuildFIO: use ceph fork to pick up the clang build fix. we should use the upstream repo, once the clang build fix gets merged. bumping up the fio helps to address following error, as this part was rewritten: src/test/fio/CMakeFiles/fio_ceph_objectstore.dir/fio_ceph_objectstore.cc.o.d -o src/test/fio/CMakeFiles/fio_ceph_objectstore.dir/fio_ceph_objectstore.cc.o -c ../src/test/fio/fio_ceph_objectstore.cc In file included from ../src/test/fio/fio_ceph_objectstore.cc:26: In file included from src/fio/fio.h:18: In file included from src/fio/thread_options.h:6: In file included from src/fio/options.h:8: src/fio/parse.h:128:13: error: arithmetic on a pointer to void return ret + offset; ~~~ ^ 1 error generated. Signed-off-by: Kefu Chai --- diff --git a/cmake/modules/BuildFIO.cmake b/cmake/modules/BuildFIO.cmake index 6a86300fae143..8a466c61a446e 100644 --- a/cmake/modules/BuildFIO.cmake +++ b/cmake/modules/BuildFIO.cmake @@ -13,10 +13,10 @@ function(build_fio) file(MAKE_DIRECTORY ${source_dir}) ExternalProject_Add(fio_ext UPDATE_COMMAND "" # this disables rebuild on each run - GIT_REPOSITORY "https://github.com/axboe/fio.git" + GIT_REPOSITORY "https://github.com/ceph/fio.git" GIT_CONFIG advice.detachedHead=false GIT_SHALLOW 1 - GIT_TAG "fio-3.15" + GIT_TAG "quincy-with-cxx" SOURCE_DIR ${source_dir} BUILD_IN_SOURCE 1 CONFIGURE_COMMAND /configure