diff options
| author |   Brian Evans <grknight@gentoo.org> | 2015-12-22 16:38:00 -0500 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2015-12-22 16:38:00 -0500 |
| commit | 7d3a382385c3d95c4edb8a4736b2f01eaac156d6 (patch) | |
| tree | e562a10f1dd85f3c9ca8d54de54fbc32bf6e1235 /20004_all_mariadb-filter-tokudb-flags-10.1.10.patch | |
| parent | Respin TokuDB flag patch for 10.1.9 (diff) | |
| download | mysql-extras-7d3a382385c3d95c4edb8a4736b2f01eaac156d6.tar.gz mysql-extras-7d3a382385c3d95c4edb8a4736b2f01eaac156d6.tar.bz2 mysql-extras-7d3a382385c3d95c4edb8a4736b2f01eaac156d6.zip | |
Respin tokudb CFLAGS patch for new MariaDB versionsmysql-extras-20151223-1501Z
Signed-off-by: Brian Evans <grknight@gentoo.org>
Diffstat (limited to '20004_all_mariadb-filter-tokudb-flags-10.1.10.patch')
| -rw-r--r-- | 20004_all_mariadb-filter-tokudb-flags-10.1.10.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/20004_all_mariadb-filter-tokudb-flags-10.1.10.patch b/20004_all_mariadb-filter-tokudb-flags-10.1.10.patch new file mode 100644 index 0000000..49f9b5b --- /dev/null +++ b/20004_all_mariadb-filter-tokudb-flags-10.1.10.patch @@ -0,0 +1,31 @@ +diff -aurN a/storage/tokudb/ft-index/cmake_modules/TokuSetupCompiler.cmake b/storage/tokudb/ft-index/cmake_modules/TokuSetupCompiler.cmake +--- a/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake 2013-09-19 18:34:24.000000000 -0400 ++++ b/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake 2013-10-09 14:16:46.197211235 -0400 +@@ -124,12 +124,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 "-flto -fuse-linker-plugin ${CMAKE_C_FLAGS_RELWITHDEBINFO} -O3 -UNDEBUG") ++ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-flto -fuse-linker-plugin ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O3 -UNDEBUG") ++ set(CMAKE_C_FLAGS_RELEASE "-flto -fuse-linker-plugin ${CMAKE_C_FLAGS_RELEASE} -UNDEBUG") ++ set(CMAKE_CXX_FLAGS_RELEASE "-flto -fuse-linker-plugin ${CMAKE_CXX_FLAGS_RELEASE} -UNDEBUG") + endif () + + ## set warnings +@@ -158,8 +156,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) |