1 |
commit: c072c4efcefc4b26eb9f3b8f0aeda9bdda40c00e |
2 |
Author: Brian Evans <grknight <AT> tuffmail <DOT> com> |
3 |
AuthorDate: Mon Apr 28 18:01:41 2014 +0000 |
4 |
Commit: Brian Evans <grknight <AT> lavabit <DOT> com> |
5 |
CommitDate: Mon Apr 28 18:01:41 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=c072c4ef |
7 |
|
8 |
[eclass] Convert multilib_build_binaries to multilib_is_native_abi |
9 |
|
10 |
Signed-off-by: Brian Evans <grknight <AT> tuffmail.com> |
11 |
|
12 |
--- |
13 |
eclass/mysql-multilib.eclass | 8 ++++---- |
14 |
1 file changed, 4 insertions(+), 4 deletions(-) |
15 |
|
16 |
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass |
17 |
index 9a2f94c..1815e75 100644 |
18 |
--- a/eclass/mysql-multilib.eclass |
19 |
+++ b/eclass/mysql-multilib.eclass |
20 |
@@ -453,7 +453,7 @@ mysql-multilib_src_configure() { |
21 |
|
22 |
configure_cmake_locale |
23 |
|
24 |
- if multilib_build_binaries ; then |
25 |
+ if multilib_is_native_abi ; then |
26 |
if use minimal ; then |
27 |
configure_cmake_minimal |
28 |
else |
29 |
@@ -493,7 +493,7 @@ mysql-multilib_src_configure() { |
30 |
mysql-multilib_src_compile() { |
31 |
#_mysql-multilib_src_compile() { |
32 |
# |
33 |
- # if ! multilib_build_binaries ; then |
34 |
+ # if ! multilib_is_native_abi ; then |
35 |
# BUILD_DIR="${BUILD_DIR}/libmysql" cmake-utils_src_compile |
36 |
# else |
37 |
# cmake-utils_src_compile |
38 |
@@ -513,7 +513,7 @@ mysql-multilib_src_install() { |
39 |
_mysql-multilib_src_install() { |
40 |
debug-print-function ${FUNCNAME} "$@" |
41 |
|
42 |
- if multilib_build_binaries; then |
43 |
+ if multilib_is_native_abi; then |
44 |
mysql-cmake_src_install |
45 |
else |
46 |
# BUILD_DIR="${BUILD_DIR}/libmysql" cmake-utils_src_install |
47 |
@@ -522,7 +522,7 @@ mysql-multilib_src_install() { |
48 |
insinto /usr/include/mysql/private |
49 |
doins sql/*.h |
50 |
fi |
51 |
- |
52 |
+ |
53 |
fi |
54 |
# Do multilib magic only when >1 ABI is used. |
55 |
if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then |