diff options
| author | Oleksandr Byelkin <sanja@sanjaLaptopT> | 2017-12-13 11:52:53 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@sanjaLaptopT> | 2017-12-13 11:52:53 +0100 |
| commit | 6837692cb2fa95fe1670e0c5cfb7d10903ac06e5 (patch) | |
| tree | d91b3b26b95195616d299855a38532977e986817 | |
| parent | de76cbdcb0728b80c0f7b453b24b0b81f653e450 (diff) | |
| download | mariadb-git-bb-10.1-MDEV-14524.tar.gz | |
MDEV-14524 TokuDB is unable to be built on Linuxbb-10.1-MDEV-14524
tokudb needs either F_NOCACHE or O_DIRECT, not both
| -rw-r--r-- | storage/tokudb/CMakeLists.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/storage/tokudb/CMakeLists.txt b/storage/tokudb/CMakeLists.txt index 4e0291545ec..f01c4aed449 100644 --- a/storage/tokudb/CMakeLists.txt +++ b/storage/tokudb/CMakeLists.txt @@ -4,13 +4,17 @@ IF(CMAKE_VERSION VERSION_LESS "2.8.9") MESSAGE(STATUS "CMake 2.8.9 or higher is required by TokuDB") ELSEIF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64") -# tokudb requires F_NOCACHE, O_DIRECT, and designated initializers +# tokudb requires F_NOCACHE or O_DIRECT, and designated initializers CHECK_CXX_SOURCE_COMPILES( " #include <fcntl.h> struct a {int b; int c; }; struct a d = { .b=1, .c=2 }; -int main() { return F_NOCACHE + O_DIRECT; } +#if defined(O_DIRECT) || defined(F_NOCACHE) +int main() { return 0; } +#else +#error +#endif " TOKUDB_OK) ENDIF() |