diff options
| author |   Stuart Shelton <stuart@shelton.me> | 2015-11-18 01:18:41 +0000 |
|---|---|---|
| committer | Stuart Shelton <stuart@shelton.me> | 2015-11-18 01:18:41 +0000 |
| commit | 66adc4cab632d00f18ff61721ac16921a0bcfb52 (patch) | |
| tree | 8c0a08cc457c695c3b13efd50aaf5c620838887b /eclass | |
| parent | Add mail-client/roundcube-1.1.3 (diff) | |
| download | srcshelton-66adc4cab632d00f18ff61721ac16921a0bcfb52.tar.gz srcshelton-66adc4cab632d00f18ff61721ac16921a0bcfb52.tar.bz2 srcshelton-66adc4cab632d00f18ff61721ac16921a0bcfb52.zip | |
Update eclass/multilib.eclass
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/multilib.eclass | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass index bcc601a1..2391ddd0 100644 --- a/eclass/multilib.eclass +++ b/eclass/multilib.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: eb0ac1d24100d6a882f109a492b60fc4a0c186f0 $ +# $Id: 69582b652c2149909c376854ea1c2770e1479e3f $ # @ECLASS: multilib.eclass # @MAINTAINER: @@ -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] |