diff options
| author | Teodor Mircea Ionita <teodor@mariadb.org> | 2018-05-10 10:00:51 +0300 |
|---|---|---|
| committer | Vicențiu-Marian Ciorbaru <cvicentiu@gmail.com> | 2018-06-10 10:12:34 +0300 |
| commit | 7053e26e1869962ef473043686996f40ac0fb88c (patch) | |
| tree | 4f4ac2bd8b2f79518153b294f1ab14ce4af8d31f /storage/tokudb/PerconaFT/src | |
| parent | 8f82c4844342f42c27e2336b64f7bdd1a1344cbd (diff) | |
| download | mariadb-git-7053e26e1869962ef473043686996f40ac0fb88c.tar.gz | |
MDEV-15778: Fix TokuDB build issues on macOS 10.13.4
Several issues were encountered and fixed as explained bellow:
* missing link to dbug lib;
* user proper fprintf format specifier;
* ZERO_COND_INITIALIZER was using wrong toku_cond_t struct
initializer for first member of type pthread_cond_t and
not considering the TOKU_PTHREAD_DEBUG case which has
one extra struct member of type pfs_key_t;
* Remove likely(!opt_debug_sync_timeout), argument is
declared extern and not available to Toku;
* pthread_mutex_timedlock() is not available in pthreads
for Mac, as it's not part of the POSIX pthreads spec.
The encompassing event_t::wait(ms) methods are unused,
thus have been removed;
Diffstat (limited to 'storage/tokudb/PerconaFT/src')
| -rw-r--r-- | storage/tokudb/PerconaFT/src/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/tokudb/PerconaFT/src/CMakeLists.txt b/storage/tokudb/PerconaFT/src/CMakeLists.txt index 65bf4814cf8..bae37389004 100644 --- a/storage/tokudb/PerconaFT/src/CMakeLists.txt +++ b/storage/tokudb/PerconaFT/src/CMakeLists.txt @@ -18,7 +18,7 @@ set(tokudb_srcs ## make the shared library add_library(${LIBTOKUDB} SHARED ${tokudb_srcs}) add_dependencies(${LIBTOKUDB} install_tdb_h generate_log_code) -target_link_libraries(${LIBTOKUDB} LINK_PRIVATE locktree_static ft_static util_static lzma snappy ${LIBTOKUPORTABILITY}) +target_link_libraries(${LIBTOKUDB} LINK_PRIVATE locktree_static ft_static util_static lzma snappy dbug ${LIBTOKUPORTABILITY}) target_link_libraries(${LIBTOKUDB} LINK_PUBLIC ${ZLIB_LIBRARY} ) ## make the static library |