| 1 |
commit: 7bf949f0b287b2b8a7c814705629a306d8acbcc7 |
| 2 |
Author: layman <layman <AT> localhost> |
| 3 |
AuthorDate: Fri May 1 18:49:27 2015 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 1 18:49:27 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=7bf949f0 |
| 7 |
|
| 8 |
Fix multilib builds wrt libbfd |
| 9 |
|
| 10 |
eclass/mysql-multilib.eclass | 17 ++++++++++++----- |
| 11 |
1 file changed, 12 insertions(+), 5 deletions(-) |
| 12 |
|
| 13 |
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass |
| 14 |
index e6432f7..4b379f9 100644 |
| 15 |
--- a/eclass/mysql-multilib.eclass |
| 16 |
+++ b/eclass/mysql-multilib.eclass |
| 17 |
@@ -569,11 +569,18 @@ multilib_src_configure() { |
| 18 |
fi |
| 19 |
|
| 20 |
if in_iuse bindist ; then |
| 21 |
- mycmakeargs+=( |
| 22 |
- -DWITH_READLINE=$(usex bindist 1 0) |
| 23 |
- -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1) |
| 24 |
- $(usex bindist -DHAVE_BFD_H=0 '') |
| 25 |
- ) |
| 26 |
+ # bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION |
| 27 |
+ if multilib_is_native_abi; then |
| 28 |
+ mycmakeargs+=( |
| 29 |
+ -DWITH_READLINE=$(usex bindist 1 0) |
| 30 |
+ -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1) |
| 31 |
+ ) |
| 32 |
+ else |
| 33 |
+ mycmakeargs+=( |
| 34 |
+ -DWITH_READLINE=1 |
| 35 |
+ -DNOT_FOR_DISTRIBUTION=0 |
| 36 |
+ ) |
| 37 |
+ fi |
| 38 |
fi |
| 39 |
|
| 40 |
### TODO: make this system but issues with UTF-8 prevent it |
Archives