Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/mysql-extras:master commit in: /
Date: Sat, 23 May 2020 12:19:52
Message-Id: 1590236354.e18b5c5dd7b65d46d60b934398ff6e0fa2e5047f.whissi@gentoo
1 commit: e18b5c5dd7b65d46d60b934398ff6e0fa2e5047f
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 23 12:19:14 2020 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Sat May 23 12:19:14 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=e18b5c5d
7
8 Respin tokudb CFLAGS patch for new MariaDB versions
9
10 Link: https://github.com/MariaDB/server/commit/a13157a561d960604c0c8cfd23b79783cfe76861
11 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
12
13 20004_all_mariadb-filter-tokudb-flags-5.5.68.patch | 21 +++++++++++++++++++++
14 1 file changed, 21 insertions(+)
15
16 diff --git a/20004_all_mariadb-filter-tokudb-flags-5.5.68.patch b/20004_all_mariadb-filter-tokudb-flags-5.5.68.patch
17 new file mode 100644
18 index 0000000..2a5c3fa
19 --- /dev/null
20 +++ b/20004_all_mariadb-filter-tokudb-flags-5.5.68.patch
21 @@ -0,0 +1,21 @@
22 +diff -aurN mysql.orig/storage/tokudb/ft-index/cmake_modules/TokuSetupCompiler.cmake mysql/storage/tokudb/ft-index/cmake_modules/TokuSetupCompiler.cmake
23 +--- mysql.orig/storage/tokudb/ft-index/cmake_modules/TokuSetupCompiler.cmake 2013-09-19 18:34:24.000000000 -0400
24 ++++ mysql/storage/tokudb/ft-index/cmake_modules/TokuSetupCompiler.cmake 2013-10-09 14:16:46.197211235 -0400
25 +@@ -136,12 +136,10 @@
26 + set(CMAKE_CXX_FLAGS_RELEASE "-g -O3 ${CMAKE_CXX_FLAGS_RELEASE} -UNDEBUG")
27 + else ()
28 + # we overwrite this because the default passes -DNDEBUG and we don't want that
29 +- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-flto -fuse-linker-plugin ${CMAKE_C_FLAGS_RELWITHDEBINFO} -g -O3 -UNDEBUG")
30 +- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-flto -fuse-linker-plugin ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g -O3 -UNDEBUG")
31 +- set(CMAKE_C_FLAGS_RELEASE "-g -O3 -flto -fuse-linker-plugin ${CMAKE_C_FLAGS_RELEASE} -UNDEBUG")
32 +- set(CMAKE_CXX_FLAGS_RELEASE "-g -O3 -flto -fuse-linker-plugin ${CMAKE_CXX_FLAGS_RELEASE} -UNDEBUG")
33 +- set(CMAKE_EXE_LINKER_FLAGS "-g -fuse-linker-plugin ${CMAKE_EXE_LINKER_FLAGS}")
34 +- set(CMAKE_SHARED_LINKER_FLAGS "-g -fuse-linker-plugin ${CMAKE_SHARED_LINKER_FLAGS}")
35 ++ set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -UNDEBUG")
36 ++ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -UNDEBUG")
37 ++ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -UNDEBUG")
38 ++ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -UNDEBUG")
39 + endif ()
40 +
41 + ## set warnings
42 +