diff options
| author |   Brian Evans <grknight@lavabit.com> | 2013-10-09 14:25:25 -0400 |
|---|---|---|
| committer | Brian Evans <grknight@lavabit.com> | 2013-10-09 15:16:44 -0400 |
| commit | 68428843d4cdc26ce8c483a6f6c3f6186169dcd9 (patch) | |
| tree | eb207e793aa7ec4e7bceafa4c8a2832e7e7dfe65 /20004_all_mariadb-filter-tokudb-flags.patch | |
| parent | Remove upstream applied patch for 5.6.13 build and fix bug numbers (diff) | |
| download | mysql-extras-68428843d4cdc26ce8c483a6f6c3f6186169dcd9.tar.gz mysql-extras-68428843d4cdc26ce8c483a6f6c3f6186169dcd9.tar.bz2 mysql-extras-68428843d4cdc26ce8c483a6f6c3f6186169dcd9.zip | |
Filter out aggressive CFLAGS for USE=tokudb on mariadb
Diffstat (limited to '20004_all_mariadb-filter-tokudb-flags.patch')
| -rw-r--r-- | 20004_all_mariadb-filter-tokudb-flags.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/20004_all_mariadb-filter-tokudb-flags.patch b/20004_all_mariadb-filter-tokudb-flags.patch new file mode 100644 index 0000000..249f0bf --- /dev/null +++ b/20004_all_mariadb-filter-tokudb-flags.patch @@ -0,0 +1,31 @@ +diff -aurN mysql.orig/storage/tokudb/ft-index/cmake_modules/TokuSetupCompiler.cmake mysql/storage/tokudb/ft-index/cmake_modules/TokuSetupCompiler.cmake +--- mysql.orig/storage/tokudb/ft-index/cmake_modules/TokuSetupCompiler.cmake 2013-09-19 18:34:24.000000000 -0400 ++++ mysql/storage/tokudb/ft-index/cmake_modules/TokuSetupCompiler.cmake 2013-10-09 14:16:46.197211235 -0400 +@@ -136,12 +136,10 @@ + set(CMAKE_CXX_FLAGS_RELEASE "-g -O3 ${CMAKE_CXX_FLAGS_RELEASE} -UNDEBUG") + else () + # we overwrite this because the default passes -DNDEBUG and we don't want that +- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-flto -fuse-linker-plugin ${CMAKE_C_FLAGS_RELWITHDEBINFO} -g -O3 -UNDEBUG") +- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-flto -fuse-linker-plugin ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g -O3 -UNDEBUG") +- set(CMAKE_C_FLAGS_RELEASE "-g -O3 -flto -fuse-linker-plugin ${CMAKE_C_FLAGS_RELEASE} -UNDEBUG") +- set(CMAKE_CXX_FLAGS_RELEASE "-g -O3 -flto -fuse-linker-plugin ${CMAKE_CXX_FLAGS_RELEASE} -UNDEBUG") +- set(CMAKE_EXE_LINKER_FLAGS "-g -fuse-linker-plugin ${CMAKE_EXE_LINKER_FLAGS}") +- set(CMAKE_SHARED_LINKER_FLAGS "-g -fuse-linker-plugin ${CMAKE_SHARED_LINKER_FLAGS}") ++ set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -UNDEBUG") ++ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -UNDEBUG") ++ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -UNDEBUG") ++ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -UNDEBUG") + endif () + + ## set warnings +@@ -172,8 +170,8 @@ + endif () + + ## always want these +-set(CMAKE_C_FLAGS "-Wall -Werror ${CMAKE_C_FLAGS}") +-set(CMAKE_CXX_FLAGS "-Wall -Werror ${CMAKE_CXX_FLAGS}") ++set(CMAKE_C_FLAGS "-Wall ${CMAKE_C_FLAGS}") ++set(CMAKE_CXX_FLAGS "-Wall ${CMAKE_CXX_FLAGS}") + + ## need to set -stdlib=libc++ to get real c++11 support on darwin + if (APPLE) |