diff options
| author |   layman <layman@localhost> | 2015-05-01 14:49:27 -0400 |
|---|---|---|
| committer | layman <layman@localhost> | 2015-05-01 14:49:27 -0400 |
| commit | 7bf949f0b287b2b8a7c814705629a306d8acbcc7 (patch) | |
| tree | 983a3914af6bcee4175434d3cd440a2b0ec171e7 | |
| parent | Sync headers and changes from portage (diff) | |
| download | mysql-7bf949f0b287b2b8a7c814705629a306d8acbcc7.tar.gz mysql-7bf949f0b287b2b8a7c814705629a306d8acbcc7.tar.bz2 mysql-7bf949f0b287b2b8a7c814705629a306d8acbcc7.zip | |
Fix multilib builds wrt libbfd
| -rw-r--r-- | eclass/mysql-multilib.eclass | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass index e6432f7..4b379f9 100644 --- a/eclass/mysql-multilib.eclass +++ b/eclass/mysql-multilib.eclass @@ -569,11 +569,18 @@ multilib_src_configure() { fi if in_iuse bindist ; then - mycmakeargs+=( - -DWITH_READLINE=$(usex bindist 1 0) - -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1) - $(usex bindist -DHAVE_BFD_H=0 '') - ) + # bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION + if multilib_is_native_abi; then + mycmakeargs+=( + -DWITH_READLINE=$(usex bindist 1 0) + -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1) + ) + else + mycmakeargs+=( + -DWITH_READLINE=1 + -DNOT_FOR_DISTRIBUTION=0 + ) + fi fi ### TODO: make this system but issues with UTF-8 prevent it |