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 879D6138A1F for ; Tue, 22 Apr 2014 01:49:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 59E0BE09A7; Tue, 22 Apr 2014 01:49:36 +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 B6E22E09A7 for ; Tue, 22 Apr 2014 01:49:35 +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 A02E933FF55 for ; Tue, 22 Apr 2014 01:49:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id B6B8418743 for ; Tue, 22 Apr 2014 01:49:32 +0000 (UTC) From: "Jorge Manuel B. S. Vicetto" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jorge Manuel B. S. Vicetto" Message-ID: <1398130953.acedaf23e89fc6b0ce6bcd3f6921d850cf37db68.jmbsvicetto@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: jmbsvicetto X-VCS-Committer-Name: Jorge Manuel B. S. Vicetto X-VCS-Revision: acedaf23e89fc6b0ce6bcd3f6921d850cf37db68 X-VCS-Branch: master Date: Tue, 22 Apr 2014 01:49:32 +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: 4f9dda67-045d-421d-8883-1877fb1f5d9d X-Archives-Hash: 6d2b9b8fb8552197d5fb6e586321d831 commit: acedaf23e89fc6b0ce6bcd3f6921d850cf37db68 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo org> AuthorDate: Tue Apr 22 01:42:33 2014 +0000 Commit: Jorge Manuel B. S. Vicetto gentoo org> CommitDate: Tue Apr 22 01:42:33 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=acedaf23 Whitespace. Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo.org> --- eclass/mysql-cmake.eclass | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass index 81159ac..a113192 100644 --- a/eclass/mysql-cmake.eclass +++ b/eclass/mysql-cmake.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.15 2013/03/04 19:10:31 robbat2 Exp $ +# $Header: $ # @ECLASS: mysql-cmake.eclass # @MAINTAINER: @@ -34,7 +34,7 @@ mysql-cmake_disable_test() { testsuite="${rawtestname/.*}" testname="${rawtestname/*.}" for mysql_disabled_file in \ - ${S}/mysql-test/disabled.def \ + ${S}/mysql-test/disabled.def \ ${S}/mysql-test/t/disabled.def ; do [[ -f ${mysql_disabled_file} ]] && break done @@ -44,8 +44,8 @@ mysql-cmake_disable_test() { if [[ ( -n ${testsuite} ) && ( ${testsuite} != "main" ) ]]; then for mysql_disabled_file in \ - ${S}/mysql-test/suite/${testsuite}/disabled.def \ - ${S}/mysql-test/suite/${testsuite}/t/disabled.def \ + ${S}/mysql-test/suite/${testsuite}/disabled.def \ + ${S}/mysql-test/suite/${testsuite}/t/disabled.def \ FAILED ; do [[ -f ${mysql_disabled_file} ]] && break done @@ -54,7 +54,7 @@ mysql-cmake_disable_test() { else for mysql_disabled_dir in \ ${S}/mysql-test/suite/${testsuite} \ - ${S}/mysql-test/suite/${testsuite}/t \ + ${S}/mysql-test/suite/${testsuite}/t \ FAILED ; do [[ -d ${mysql_disabled_dir} ]] && break done @@ -251,7 +251,7 @@ mysql-cmake_src_prepare() { [[ -f ${i} ]] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}" rm -f "scripts/mysqlbug" - if use jemalloc && ! ( [[ ${PN} == "mariadb" ]] && mysql_version_is_at_least "5.5.33" ); then + if use jemalloc && ! ( [[ ${PN} == "mariadb" ]] && mysql_version_is_at_least "5.5.33" ); then echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt" fi @@ -348,7 +348,7 @@ mysql-cmake_src_configure() { CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing" CXXFLAGS="${CXXFLAGS} -felide-constructors" - # Causes linkage failures. Upstream bug #59607 removes it + # Causes linkage failures. Upstream bug #59607 removes it if ! mysql_version_is_at_least "5.6" ; then CXXFLAGS="${CXXFLAGS} -fno-implicit-templates" fi