diff options
| author |   Brian Evans <grknight@gentoo.org> | 2015-11-23 11:43:10 -0500 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2015-11-23 11:43:10 -0500 |
| commit | 572718ce895485b442d048b6c310b1bb2e4465f6 (patch) | |
| tree | b95feccb8fd45cdeacf7362e208c206b83b9c3d7 | |
| parent | Add patches to index for mysql-cluster releases (diff) | |
| download | mysql-extras-20151123-1643Z.tar.gz mysql-extras-20151123-1643Z.tar.bz2 mysql-extras-20151123-1643Z.zip | |
Respin TokuDB flag patch for 10.1.9mysql-extras-20151123-1643Z
Signed-off-by: Brian Evans <grknight@gentoo.org>
| -rw-r--r-- | 00000_index.txt | 8 | ||||
| -rw-r--r-- | 20004_all_mariadb-filter-tokudb-flags-10.1.9.patch | 31 |
2 files changed, 38 insertions, 1 deletions
diff --git a/00000_index.txt b/00000_index.txt index 54f3e9f..dc126aa 100644 --- a/00000_index.txt +++ b/00000_index.txt @@ -532,7 +532,13 @@ @@ Filter out -flto -fuse-linker-plugin -g and -Werror for tokudb @patch 20004_all_mariadb-filter-tokudb-flags-10.0.7.patch -@ver 10.00.07.00 to 10.99.99.99 +@ver 10.00.07.00 to 10.01.08.99 +@pn mariadb +@pn mariadb-galera +@@ Filter out -flto -fuse-linker-plugin -g and -Werror for tokudb + +@patch 20004_all_mariadb-filter-tokudb-flags-10.1.9.patch +@ver 10.01.09.00 to 10.99.99.99 @pn mariadb @pn mariadb-galera @@ Filter out -flto -fuse-linker-plugin -g and -Werror for tokudb diff --git a/20004_all_mariadb-filter-tokudb-flags-10.1.9.patch b/20004_all_mariadb-filter-tokudb-flags-10.1.9.patch new file mode 100644 index 0000000..5156aee --- /dev/null +++ b/20004_all_mariadb-filter-tokudb-flags-10.1.9.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/ft-index/cmake_modules/TokuSetupCompiler.cmake 2013-09-19 18:34:24.000000000 -0400 ++++ b/storage/tokudb/ft-index/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) |