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 6C3271395D3 for ; Mon, 27 Jul 2015 20:28:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1EE9DE07DF; Mon, 27 Jul 2015 20:28:46 +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 AE78FE07DF for ; Mon, 27 Jul 2015 20:28:45 +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 B207D3406F0 for ; Mon, 27 Jul 2015 20:28:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ECD2FAA for ; Mon, 27 Jul 2015 20:28:40 +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: <1438019054.f051ae75402763b80bd9a10a44a6b75dd2f34426.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: f051ae75402763b80bd9a10a44a6b75dd2f34426 X-VCS-Branch: master Date: Mon, 27 Jul 2015 20:28:40 +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: c4695aae-9416-4016-8072-3b09599e082f X-Archives-Hash: 98528c5fe12a7d579de5e69ef0ce41d0 commit: f051ae75402763b80bd9a10a44a6b75dd2f34426 Author: Brian Evans gentoo org> AuthorDate: Mon Jul 27 17:44:14 2015 +0000 Commit: Brian Evans gentoo org> CommitDate: Mon Jul 27 17:44:14 2015 +0000 URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=f051ae75 Fix compatibilty with old builds for building the server eclass/mysql-multilib.eclass | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass index 4385728..d8bb0a6 100644 --- a/eclass/mysql-multilib.eclass +++ b/eclass/mysql-multilib.eclass @@ -672,10 +672,14 @@ multilib_src_configure() { if use_if_iuse minimal ; then configure_cmake_minimal - elif multilib_is_native_abi && use_if_iuse server ; then - configure_cmake_standard + elif in_iuse server ; then + if multilib_is_native_abi && use server ; then + configure_cmake_standard + else + configure_cmake_minimal + fi else - configure_cmake_minimal + configure_cmake_standard fi # Always build NDB with mysql-cluster for libndbclient