commit: 0435919679340c2127a8dfc5268c322f0de85c05
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 16 07:10:52 2015 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Nov 16 07:13:47 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04359196
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.
eclass/multilib.eclass | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index eb0ac1d..69582b6 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]
