From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-847324-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 1DF271384B4
for <garchives@archives.gentoo.org>; Wed, 18 Nov 2015 14:31:43 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 85E5C21C005;
Wed, 18 Nov 2015 14:31:41 +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 1158F21C005
for <gentoo-commits@lists.gentoo.org>; Wed, 18 Nov 2015 14:31:40 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 18BD73408D4
for <gentoo-commits@lists.gentoo.org>; Wed, 18 Nov 2015 14:31:40 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 0B6F1B5D
for <gentoo-commits@lists.gentoo.org>; Wed, 18 Nov 2015 14:31:35 +0000 (UTC)
From: "Brian Evans" <grknight@gentoo.org>
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" <grknight@gentoo.org>
Message-ID: <1447341252.9aaf18966bccd86b6b01e8480b2ec52f6d66cdc5.grknight@gentoo>
Subject: [gentoo-commits] proj/mysql:master commit in: eclass/
X-VCS-Repository: proj/mysql
X-VCS-Files: eclass/mysql-multilib.eclass
X-VCS-Directories: eclass/
X-VCS-Committer: grknight
X-VCS-Committer-Name: Brian Evans
X-VCS-Revision: 9aaf18966bccd86b6b01e8480b2ec52f6d66cdc5
X-VCS-Branch: master
Date: Wed, 18 Nov 2015 14:31:35 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: fc68b9da-e64d-4579-9f9b-dc198ec5aae9
X-Archives-Hash: 8d46b0ee9bda865372b5b61383502432
commit: 9aaf18966bccd86b6b01e8480b2ec52f6d66cdc5
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 12 15:14:12 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Nov 12 15:14:12 2015 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=9aaf1896
mysql-multilib.eclass: Require gcc-4.7 to be active on non-x86{,_64} platforms
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>
eclass/mysql-multilib.eclass | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 23683f5..0016e76 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -192,7 +192,7 @@ fi
LICENSE="GPL-2"
SLOT="0/${SUBSLOT:-0}"
-IUSE="cluster debug embedded extraengine jemalloc latin1 libressl +openssl
+IUSE="debug embedded extraengine jemalloc latin1 libressl +openssl
+perl profiling selinux systemtap static static-libs tcmalloc test yassl"
REQUIRED_USE="^^ ( yassl openssl libressl )"
@@ -503,15 +503,22 @@ mysql-multilib_disable_test() {
# Perform some basic tests and tasks during pkg_pretend phase:
mysql-multilib_pkg_pretend() {
if [[ ${MERGE_TYPE} != binary ]] ; then
- if use_if_iuse tokudb && [[ $(gcc-major-version) -lt 4 || \
- $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ; then
+ local GCC_MAJOR_SET=$(gcc-major-version)
+ local GCC_MINOR_SET=$(gcc-minor-version)
+ if use_if_iuse tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \
+ ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
eerror "${PN} with tokudb needs to be built with gcc-4.7 or later."
eerror "Please use gcc-config to switch to gcc-4.7 or later version."
die
fi
- fi
- if use_if_iuse cluster && [[ "${PN}" != "mysql-cluster" ]]; then
- die "NDB Cluster support has been removed from all packages except mysql-cluster"
+ # Bug 565584. InnoDB now requires atomic functions introduced with gcc-4.7 on
+ # non x86{,_64} arches
+ if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
+ ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
+ eerror "${PN} needs to be built with gcc-4.7 or later."
+ eerror "Please use gcc-config to switch to gcc-4.7 or later version."
+ die
+ fi
fi
}
@@ -887,7 +894,7 @@ mysql-multilib_pkg_postinst() {
elog "mysql_upgrade tool."
einfo
- if [[ ${PN} == "mariadb-galera" ]] ; then
+ if [[ ${PN} == "mariadb-galera" ]] || use_if_iuse galera ; then
einfo
elog "Be sure to edit the my.cnf file to activate your cluster settings."
elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\""