Gentoo Archives: gentoo-commits

From: Brian Evans <grknight@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/mysql-extras:master commit in: /
Date: Mon, 23 Nov 2015 16:43:50
Message-Id: 1448296990.572718ce895485b442d048b6c310b1bb2e4465f6.grknight@gentoo
1 commit: 572718ce895485b442d048b6c310b1bb2e4465f6
2 Author: Brian Evans <grknight <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 23 16:43:10 2015 +0000
4 Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 23 16:43:10 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=572718ce
7
8 Respin TokuDB flag patch for 10.1.9
9
10 Signed-off-by: Brian Evans <grknight <AT> gentoo.org>
11
12 00000_index.txt | 8 +++++-
13 20004_all_mariadb-filter-tokudb-flags-10.1.9.patch | 31 ++++++++++++++++++++++
14 2 files changed, 38 insertions(+), 1 deletion(-)
15
16 diff --git a/00000_index.txt b/00000_index.txt
17 index 54f3e9f..dc126aa 100644
18 --- a/00000_index.txt
19 +++ b/00000_index.txt
20 @@ -532,7 +532,13 @@
21 @@ Filter out -flto -fuse-linker-plugin -g and -Werror for tokudb
22
23 @patch 20004_all_mariadb-filter-tokudb-flags-10.0.7.patch
24 -@ver 10.00.07.00 to 10.99.99.99
25 +@ver 10.00.07.00 to 10.01.08.99
26 +@pn mariadb
27 +@pn mariadb-galera
28 +@@ Filter out -flto -fuse-linker-plugin -g and -Werror for tokudb
29 +
30 +@patch 20004_all_mariadb-filter-tokudb-flags-10.1.9.patch
31 +@ver 10.01.09.00 to 10.99.99.99
32 @pn mariadb
33 @pn mariadb-galera
34 @@ Filter out -flto -fuse-linker-plugin -g and -Werror for tokudb
35
36 diff --git a/20004_all_mariadb-filter-tokudb-flags-10.1.9.patch b/20004_all_mariadb-filter-tokudb-flags-10.1.9.patch
37 new file mode 100644
38 index 0000000..5156aee
39 --- /dev/null
40 +++ b/20004_all_mariadb-filter-tokudb-flags-10.1.9.patch
41 @@ -0,0 +1,31 @@
42 +diff -aurN a/storage/tokudb/ft-index/cmake_modules/TokuSetupCompiler.cmake b/storage/tokudb/ft-index/cmake_modules/TokuSetupCompiler.cmake
43 +--- a/storage/tokudb/ft-index/cmake_modules/TokuSetupCompiler.cmake 2013-09-19 18:34:24.000000000 -0400
44 ++++ b/storage/tokudb/ft-index/cmake_modules/TokuSetupCompiler.cmake 2013-10-09 14:16:46.197211235 -0400
45 +@@ -124,12 +124,10 @@
46 + set(CMAKE_CXX_FLAGS_RELEASE "-g -O3 ${CMAKE_CXX_FLAGS_RELEASE} -UNDEBUG")
47 + else ()
48 + # we overwrite this because the default passes -DNDEBUG and we don't want that
49 +- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-flto -fuse-linker-plugin ${CMAKE_C_FLAGS_RELWITHDEBINFO} -g -O3 -UNDEBUG")
50 +- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-flto -fuse-linker-plugin ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g -O3 -UNDEBUG")
51 +- set(CMAKE_C_FLAGS_RELEASE "-g -O3 -flto -fuse-linker-plugin ${CMAKE_C_FLAGS_RELEASE} -UNDEBUG")
52 +- set(CMAKE_CXX_FLAGS_RELEASE "-g -O3 -flto -fuse-linker-plugin ${CMAKE_CXX_FLAGS_RELEASE} -UNDEBUG")
53 +- set(CMAKE_EXE_LINKER_FLAGS "-g -fuse-linker-plugin ${CMAKE_EXE_LINKER_FLAGS}")
54 +- set(CMAKE_SHARED_LINKER_FLAGS "-g -fuse-linker-plugin ${CMAKE_SHARED_LINKER_FLAGS}")
55 ++ set(CMAKE_C_FLAGS_RELWITHDEBINFO "-flto -fuse-linker-plugin ${CMAKE_C_FLAGS_RELWITHDEBINFO} -O3 -UNDEBUG")
56 ++ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-flto -fuse-linker-plugin ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O3 -UNDEBUG")
57 ++ set(CMAKE_C_FLAGS_RELEASE "-flto -fuse-linker-plugin ${CMAKE_C_FLAGS_RELEASE} -UNDEBUG")
58 ++ set(CMAKE_CXX_FLAGS_RELEASE "-flto -fuse-linker-plugin ${CMAKE_CXX_FLAGS_RELEASE} -UNDEBUG")
59 + endif ()
60 +
61 + ## set warnings
62 +@@ -158,8 +156,8 @@
63 + endif ()
64 +
65 + ## always want these
66 +-set(CMAKE_C_FLAGS "-Wall -Werror ${CMAKE_C_FLAGS}")
67 +-set(CMAKE_CXX_FLAGS "-Wall -Werror ${CMAKE_CXX_FLAGS}")
68 ++set(CMAKE_C_FLAGS "-Wall ${CMAKE_C_FLAGS}")
69 ++set(CMAKE_CXX_FLAGS "-Wall ${CMAKE_CXX_FLAGS}")
70 +
71 + ## need to set -stdlib=libc++ to get real c++11 support on darwin
72 + if (APPLE)