database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00
Code Activity

fix tokudb compilation with bundled zlib

Browse Source
This commit is contained in:
Sergei Golubchik
2015-11-19 16:39:40 +01:00
parent d4017d498f
commit 33ab30dfe2
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
storage/tokudb/CMakeLists.txt
View File

@@ -14,8 +14,7 @@ IF(NOT TOKUDB_OK)
ENDIF()
SET(TOKUDB_SOURCES ha_tokudb.cc)
MYSQL_ADD_PLUGIN(tokudb ${TOKUDB_SOURCES} STORAGE_ENGINE MODULE_ONLY
LINK_LIBRARIES ${ZLIB_LIBRARY} stdc++)
MYSQL_ADD_PLUGIN(tokudb ${TOKUDB_SOURCES} STORAGE_ENGINE MODULE_ONLY)
IF(NOT TARGET tokudb)
RETURN()
@@ -85,7 +84,8 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/ft-index)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/ft-index/buildheader)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/ft-index/portability)
TARGET_LINK_LIBRARIES(tokudb tokufractaltree_static tokuportability_static)
TARGET_LINK_LIBRARIES(tokudb tokufractaltree_static tokuportability_static
${ZLIB_LIBRARY} stdc++)
SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} -flto -fuse-linker-plugin")
SET(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO} -flto -fuse-linker-plugin")

1
storage/tokudb/ft-index/tools/tokuft_logprint.cc
View File

@@ -91,6 +91,7 @@ PATENT RIGHTS GRANT:
/* Dump the log from stdin to stdout. */
#include <my_config.h>
#include "ft/log_header.h"
#include "ft/logger/logger.h"