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 4D7D21381F3 for ; Thu, 25 Apr 2013 17:38:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DF702E093A; Thu, 25 Apr 2013 17:38:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 808A9E093A for ; Thu, 25 Apr 2013 17:38:24 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 99C8D33DA23 for ; Thu, 25 Apr 2013 17:38:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 12E7EE408C for ; Thu, 25 Apr 2013 17:38:22 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1366911492.4a2efe4ea1c2c1ff681425f2775f84d8cc330982.robbat2@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql-cmake.eclass X-VCS-Directories: eclass/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 4a2efe4ea1c2c1ff681425f2775f84d8cc330982 X-VCS-Branch: master Date: Thu, 25 Apr 2013 17:38:22 +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: e8d51736-d79e-4673-9718-cafb39260105 X-Archives-Hash: a3ec0d80fdb91e7e4dbb523b7f3cc5db commit: 4a2efe4ea1c2c1ff681425f2775f84d8cc330982 Author: Robin H. Johnson orbis-terrarum net> AuthorDate: Thu Apr 25 17:38:09 2013 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Thu Apr 25 17:38:12 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=4a2efe4e Prepwork for MySQL 5.7 release. Signed-off-by: Robin H. Johnson orbis-terrarum.net> --- eclass/mysql-cmake.eclass | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass index 483037b..a739caf 100644 --- a/eclass/mysql-cmake.eclass +++ b/eclass/mysql-cmake.eclass @@ -274,12 +274,16 @@ mysql-cmake_src_configure() { # Bug #114895, bug #110149 filter-flags "-O" "-O[01]" - CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing" + CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing" CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti" # Causes linkage failures. Upstream bug #59607 removes it if ! mysql_version_is_at_least "5.6" ; then CXXFLAGS="${CXXFLAGS} -fno-implicit-templates" fi + # As of 5.7, exceptions are used! + if ! mysql_version_is_at_least "5.7" ; then + CXXFLAGS="${CXXFLAGS} -fno-exceptions" + fi export CXXFLAGS # bug #283926, with GCC4.4, this is required to get correct behavior.