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 8A534138A1F for ; Mon, 28 Apr 2014 18:10:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ED4B4E0932; Mon, 28 Apr 2014 18:10:51 +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 72FACE0932 for ; Mon, 28 Apr 2014 18:10:51 +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 D056133FB9F for ; Mon, 28 Apr 2014 18:10:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 922541818D for ; Mon, 28 Apr 2014 18:10:48 +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: <1398708101.c072c4efcefc4b26eb9f3b8f0aeda9bdda40c00e.grknight.pub@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.pub X-VCS-Committer-Name: Brian Evans X-VCS-Revision: c072c4efcefc4b26eb9f3b8f0aeda9bdda40c00e X-VCS-Branch: master Date: Mon, 28 Apr 2014 18:10:48 +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: f4ed20ca-f4cd-4755-8165-d32a9243d555 X-Archives-Hash: 57d1acfe2ae5ffb9eea300510c16eb55 commit: c072c4efcefc4b26eb9f3b8f0aeda9bdda40c00e Author: Brian Evans tuffmail com> AuthorDate: Mon Apr 28 18:01:41 2014 +0000 Commit: Brian Evans lavabit com> CommitDate: Mon Apr 28 18:01:41 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=c072c4ef [eclass] Convert multilib_build_binaries to multilib_is_native_abi Signed-off-by: Brian Evans tuffmail.com> --- eclass/mysql-multilib.eclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass index 9a2f94c..1815e75 100644 --- a/eclass/mysql-multilib.eclass +++ b/eclass/mysql-multilib.eclass @@ -453,7 +453,7 @@ mysql-multilib_src_configure() { configure_cmake_locale - if multilib_build_binaries ; then + if multilib_is_native_abi ; then if use minimal ; then configure_cmake_minimal else @@ -493,7 +493,7 @@ mysql-multilib_src_configure() { mysql-multilib_src_compile() { #_mysql-multilib_src_compile() { # - # if ! multilib_build_binaries ; then + # if ! multilib_is_native_abi ; then # BUILD_DIR="${BUILD_DIR}/libmysql" cmake-utils_src_compile # else # cmake-utils_src_compile @@ -513,7 +513,7 @@ mysql-multilib_src_install() { _mysql-multilib_src_install() { debug-print-function ${FUNCNAME} "$@" - if multilib_build_binaries; then + if multilib_is_native_abi; then mysql-cmake_src_install else # BUILD_DIR="${BUILD_DIR}/libmysql" cmake-utils_src_install @@ -522,7 +522,7 @@ mysql-multilib_src_install() { insinto /usr/include/mysql/private doins sql/*.h fi - + fi # Do multilib magic only when >1 ABI is used. if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then