commit: c072c4efcefc4b26eb9f3b8f0aeda9bdda40c00e
Author: Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Mon Apr 28 18:01:41 2014 +0000
Commit: Brian Evans <grknight <AT> lavabit <DOT> 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 <grknight <AT> 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