diff options
| author |   Steven J Newbury <steve@snewbury.org.uk> | 2009-04-29 13:26:48 +0100 |
|---|---|---|
| committer | Steven J Newbury <steve@snewbury.org.uk> | 2009-04-29 13:26:48 +0100 |
| commit | 9057d93937e7941aa5cccaaa46a184da94889c2d (patch) | |
| tree | cf03806cf3a2e2a42defd2bcec61fda31c5a6843 /eclass | |
| parent | Fix mysql build. This isn't the ideal fix; that would be handling (diff) | |
| download | multilib-portage-9057d93937e7941aa5cccaaa46a184da94889c2d.tar.gz multilib-portage-9057d93937e7941aa5cccaaa46a184da94889c2d.tar.bz2 multilib-portage-9057d93937e7941aa5cccaaa46a184da94889c2d.zip | |
Make mysql hack conditional and improve comments.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/multilib-native.eclass | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/eclass/multilib-native.eclass b/eclass/multilib-native.eclass index 3a98666bd..4a6b8f5fd 100644 --- a/eclass/multilib-native.eclass +++ b/eclass/multilib-native.eclass @@ -242,10 +242,16 @@ multilib-native_setup_abi_env() { fi # Hack to get mysql.eclass to work: mysql.eclass only sets MY_LIBDIR - # if it isn't already unset, this results in it being set during the - # src_unpack phase and always being set to the DEFAULT_ABI libdir. + # if it isn't already unset, this results in it being defined during + # the src_unpack phase and always being set to the DEFAULT_ABI libdir. + # mysql_version_is_at_least is defined in mysql_fx.eclass, which is + # inherited by mysql.eclass, if it exists then the ebuild has + # inherited mysql.eclass. + # # Ideally we should make src_unpack multilib instead. <-- TODO! - export MY_LIBDIR=/usr/$(get_libdir)/mysql + if mysql_version_is_at_least &>/dev/null; then + [[ -n ${MY_LIBDIR} ]] && export MY_LIBDIR=/usr/$(get_libdir)/mysql + fi # If we aren't building for the DEFAULT ABI we may need to use some # ABI specific programs during the build. The python binary is |