diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2015-11-16 08:10:52 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2015-11-16 08:13:47 +0100 |
| commit | 0435919679340c2127a8dfc5268c322f0de85c05 (patch) | |
| tree | 9ef659da92a80cee2a13e29227e0f4939da6f37b /eclass | |
| parent | eutils.eclass: in_iuse and einstalldocs are part of EAPI 6 (diff) | |
| download | gentoo-0435919679340c2127a8dfc5268c322f0de85c05.tar.gz gentoo-0435919679340c2127a8dfc5268c322f0de85c05.tar.bz2 gentoo-0435919679340c2127a8dfc5268c322f0de85c05.zip | |
multilib.eclass: get_libdir is part of EAPI 6
Disable get_libdir in EAPIs other than {0..5} since it is now part of
EAPI.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/multilib.eclass | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass index eb0ac1d24100..69582b652c21 100644 --- a/eclass/multilib.eclass +++ b/eclass/multilib.eclass @@ -49,15 +49,17 @@ has_multilib_profile() { # fall back on old behavior. Any profile that has these set should also # depend on a newer version of portage (not yet released) which uses these # over CONF_LIBDIR in econf, dolib, etc... -get_libdir() { - local CONF_LIBDIR - if [ -n "${CONF_LIBDIR_OVERRIDE}" ] ; then - # if there is an override, we want to use that... always. - echo ${CONF_LIBDIR_OVERRIDE} - else - get_abi_LIBDIR - fi -} +if has "${EAPI:-0}" 0 1 2 3 4 5; then + get_libdir() { + local CONF_LIBDIR + if [ -n "${CONF_LIBDIR_OVERRIDE}" ] ; then + # if there is an override, we want to use that... always. + echo ${CONF_LIBDIR_OVERRIDE} + else + get_abi_LIBDIR + fi + } +fi # @FUNCTION: get_abi_var # @USAGE: <VAR> [ABI] |