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 470861384A7 for ; Tue, 28 Jul 2015 22:28:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1970D14017; Tue, 28 Jul 2015 22:28:03 +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 C9AE014017 for ; Tue, 28 Jul 2015 22:28:02 +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 B74AB33FE7D for ; Tue, 28 Jul 2015 22:28:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C08F3AA for ; Tue, 28 Jul 2015 22:27:58 +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: <1438122472.90500da3ac92f0cc99059cb366583f74b5f4f48d.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: 90500da3ac92f0cc99059cb366583f74b5f4f48d X-VCS-Branch: master Date: Tue, 28 Jul 2015 22:27:58 +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: 8977a3ee-ba55-4b5e-828e-e23fd36802eb X-Archives-Hash: 86b7773a190b65b09278d99dd90f4ec1 commit: 90500da3ac92f0cc99059cb366583f74b5f4f48d Author: Brian Evans gentoo org> AuthorDate: Tue Jul 28 22:27:52 2015 +0000 Commit: Brian Evans gentoo org> CommitDate: Tue Jul 28 22:27:52 2015 +0000 URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=90500da3 Sync multilib fix and headers from portage eclass/mysql-multilib.eclass | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass index d8bb0a6..a7d3c31 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.21 2015/06/10 18:08:02 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.23 2015/07/28 20:51:40 grknight Exp $ # @ECLASS: mysql-multilib.eclass # @MAINTAINER: @@ -679,7 +679,11 @@ multilib_src_configure() { configure_cmake_minimal fi else - configure_cmake_standard + if multilib_is_native_abi ; then + configure_cmake_standard + else + configure_cmake_minimal + fi fi # Always build NDB with mysql-cluster for libndbclient