summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2020-05-23 14:19:14 +0200
committerThomas Deutschmann <whissi@gentoo.org>2020-05-23 14:19:14 +0200
commite18b5c5dd7b65d46d60b934398ff6e0fa2e5047f (patch)
tree5ac60f323601d1182cfa692068f6355735f44957
parentFix 20018_all_*-8.0.*-without-clientlibs-tools.patch (diff)
downloadmysql-extras-e18b5c5dd7b65d46d60b934398ff6e0fa2e5047f.tar.gz
mysql-extras-e18b5c5dd7b65d46d60b934398ff6e0fa2e5047f.tar.bz2
mysql-extras-e18b5c5dd7b65d46d60b934398ff6e0fa2e5047f.zip
Respin tokudb CFLAGS patch for new MariaDB versionsHEADmysql-extras-20200523-1221Zmaster
Link: https://github.com/MariaDB/server/commit/a13157a561d960604c0c8cfd23b79783cfe76861 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
-rw-r--r--20004_all_mariadb-filter-tokudb-flags-5.5.68.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/20004_all_mariadb-filter-tokudb-flags-5.5.68.patch b/20004_all_mariadb-filter-tokudb-flags-5.5.68.patch
new file mode 100644
index 0000000..2a5c3fa
--- /dev/null
+++ b/20004_all_mariadb-filter-tokudb-flags-5.5.68.patch
@@ -0,0 +1,21 @@
+diff -aurN mysql.orig/storage/tokudb/ft-index/cmake_modules/TokuSetupCompiler.cmake mysql/storage/tokudb/ft-index/cmake_modules/TokuSetupCompiler.cmake
+--- mysql.orig/storage/tokudb/ft-index/cmake_modules/TokuSetupCompiler.cmake 2013-09-19 18:34:24.000000000 -0400
++++ mysql/storage/tokudb/ft-index/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} -UNDEBUG")
++ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -UNDEBUG")
++ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -UNDEBUG")
++ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -UNDEBUG")
+ endif ()
+
+ ## set warnings
+