From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3579E138247 for ; Mon, 20 Jan 2014 02:05:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BE99EE0E7D; Mon, 20 Jan 2014 02:05:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 41AADE0E7D for ; Mon, 20 Jan 2014 02:05:07 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 43C7A335DEE for ; Mon, 20 Jan 2014 02:05:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id D0E0F1807D for ; Mon, 20 Jan 2014 02:05:04 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1390183481.1f0915eba7095c4b16d9b2e17a941ba1686b6d63.grknight.pub@gentoo> Subject: [gentoo-commits] proj/mysql-extras:master commit in: / X-VCS-Repository: proj/mysql-extras X-VCS-Files: 00000_index.txt 20004_all_mariadb-filter-tokudb-flags-10.0.7.patch X-VCS-Directories: / X-VCS-Committer: grknight.pub X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 1f0915eba7095c4b16d9b2e17a941ba1686b6d63 X-VCS-Branch: master Date: Mon, 20 Jan 2014 02:05:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d02feea5-1c16-4af0-b08e-545aed6441d8 X-Archives-Hash: 05774a87b901f43ed0058fb441b27e07 commit: 1f0915eba7095c4b16d9b2e17a941ba1686b6d63 Author: Brian Evans tuffmail com> AuthorDate: Mon Jan 20 02:02:54 2014 +0000 Commit: Brian Evans lavabit com> CommitDate: Mon Jan 20 02:04:41 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=1f0915eb Respin tokudb patch for 10.0.7 --- 00000_index.txt | 8 ++++- 20004_all_mariadb-filter-tokudb-flags-10.0.7.patch | 42 ++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/00000_index.txt b/00000_index.txt index d3c4941..972c386 100644 --- a/00000_index.txt +++ b/00000_index.txt @@ -1540,7 +1540,13 @@ @@ Filter out -flto -fuse-linker-plugin -g and -Werror for tokudb @patch 20004_all_mariadb-filter-tokudb-flags.patch -@ver 10.00.05.00 to 10.99.99.99 +@ver 10.00.05.00 to 10.00.06.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.0.7.patch +@ver 10.00.07.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.0.7.patch b/20004_all_mariadb-filter-tokudb-flags-10.0.7.patch new file mode 100644 index 0000000..5e640a7 --- /dev/null +++ b/20004_all_mariadb-filter-tokudb-flags-10.0.7.patch @@ -0,0 +1,42 @@ +--- mysql.orig/storage/tokudb/CMakeLists.txt 2014-01-16 16:23:26.731243149 -0500 ++++ mysql/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 +--- 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} -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)