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 49696138CC5 for ; Tue, 17 Mar 2015 19:45:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CA557E09DF; Tue, 17 Mar 2015 19:45:10 +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 69367E09DF for ; Tue, 17 Mar 2015 19:45:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 779B6340A0D for ; Tue, 17 Mar 2015 19:45:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0F9B213F44 for ; Tue, 17 Mar 2015 19:45:06 +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: <1426621489.f253a7a3df0c6429b552e63b41cc661ed0370b00.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: f253a7a3df0c6429b552e63b41cc661ed0370b00 X-VCS-Branch: master Date: Tue, 17 Mar 2015 19:45:06 +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: ef3c2462-12c9-47c3-bb91-93fd3b3a7b39 X-Archives-Hash: 779424170938a97bcc0418f147a67142 commit: f253a7a3df0c6429b552e63b41cc661ed0370b00 Author: Brian Evans gentoo org> AuthorDate: Tue Mar 17 19:44:49 2015 +0000 Commit: Brian Evans gentoo org> CommitDate: Tue Mar 17 19:44:49 2015 +0000 URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=f253a7a3 Use tc-ld-disable-gold from toolchain-funcs eclass/mysql-multilib.eclass | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass index f33da92..3875a54 100644 --- a/eclass/mysql-multilib.eclass +++ b/eclass/mysql-multilib.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.17 2015/03/08 09:42:19 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.18 2015/03/17 19:39:43 grknight Exp $ # @ECLASS: mysql-multilib.eclass # @MAINTAINER: @@ -426,14 +426,6 @@ mysql-multilib_disable_test() { # Perform some basic tests and tasks during pkg_pretend phase: mysql-multilib_pkg_pretend() { if [[ ${MERGE_TYPE} != binary ]] ; then - # Bug 508724 - if [[ ${PN} == 'mariadb' || ${PN} == 'mariadb-galera' ]] && \ - test-flags-CC -fuse-ld=bfd > /dev/null && - $(tc-getLD) --version | grep -q "GNU gold"; then - eerror "MariaDB will not build with the gold linker." - eerror "Please select the bfd linker with binutils-config." - die "GNU gold detected" - fi if use_if_iuse tokudb && [[ $(gcc-major-version) -lt 4 || \ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ; then eerror "${PN} with tokudb needs to be built with gcc-4.7 or later." @@ -521,7 +513,7 @@ mysql-multilib_src_configure() { # bug 508724 mariadb cannot use ld.gold if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then - append-ldflags $(test-flags-CXX -fuse-ld=bfd) + tc-ld-disable-gold fi multilib-minimal_src_configure