[gentoo-commits] proj/mysql-extras:master commit in: /

[Brian Evans]

commit:     7d3a382385c3d95c4edb8a4736b2f01eaac156d6
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 22 21:38:00 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Dec 22 21:38:00 2015 +0000
URL:        https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=7d3a3823

Respin tokudb CFLAGS patch for new MariaDB versions

Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 00000_index.txt                                    | 17 +++++++--
 ...4_all_mariadb-filter-tokudb-flags-10.0.23.patch | 42 ++++++++++++++++++++++
 ...4_all_mariadb-filter-tokudb-flags-10.1.10.patch | 31 ++++++++++++++++
 3 files changed, 87 insertions(+), 3 deletions(-)

diff --git a/00000_index.txt b/00000_index.txt
index dc126aa..6b8eea9 100644
--- a/00000_index.txt
+++ b/00000_index.txt
@@ -532,17 +532,28 @@
 @@ 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.01.08.99
+@ver 10.00.07.00 to 10.00.22.99
+@ver 10.01.00.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
+@patch 20004_all_mariadb-filter-tokudb-flags-10.0.23.patch
+@ver 10.00.23.00 to 10.00.99.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.01.09.99
+@pn mariadb
+@@ Filter out -g and -Werror for tokudb
+
+@patch 20004_all_mariadb-filter-tokudb-flags-10.1.10.patch
+@ver 10.01.10.00 to 10.01.99.99
+@pn mariadb
+@@ Filter out -g and -Werror for tokudb
+
 @patch 20005_all_mysql-unittest-5.1.73.patch
 @ver 5.01.73.00 to 5.01.99.99
 @pn mysql

diff --git a/20004_all_mariadb-filter-tokudb-flags-10.0.23.patch b/20004_all_mariadb-filter-tokudb-flags-10.0.23.patch
new file mode 100644
index 0000000..cc11566
--- /dev/null
+++ b/20004_all_mariadb-filter-tokudb-flags-10.0.23.patch
@@ -0,0 +1,42 @@
+--- a/storage/tokudb/CMakeLists.txt	2014-01-16 16:23:26.731243149 -0500
++++ b/storage/tokudb/CMakeLists.txt	2014-01-16 16:26:29.197327097 -0500
+@@ -58,8 +58,6 @@
+ SET(TOKUDB_SOURCES ha_tokudb.cc)
+ MYSQL_ADD_PLUGIN(tokudb ${TOKUDB_SOURCES} STORAGE_ENGINE MODULE_ONLY
+     LINK_LIBRARIES 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")
+ 
+ SET(CPACK_RPM_server_PACKAGE_OBSOLETES
+   "${CPACK_RPM_server_PACKAGE_OBSOLETES} MariaDB-tokudb-engine < 10.0.5" PARENT_SCOPE)
+diff -aurN mysql.orig/storage/tokudb/ft-index/cmake_modules/TokuSetupCompiler.cmake mysql/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
+@@ -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} -O3 -UNDEBUG")
++  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O3 -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)

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)