summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2021-06-21 14:44:42 +0100
committerSergei Trofimovich <slyfox@gentoo.org>2021-06-21 14:46:20 +0100
commit279f37e6f42a9ee83d797c8ca350aaf7ac7279e9 (patch)
tree5b4fdf5ae4c509b74503c2e7762cf7649fbe3109
parenttoolchain-funcs.eclass: restore EAPI=0 support used by crossdev (diff)
downloadgentoo-279f37e6f42a9ee83d797c8ca350aaf7ac7279e9.tar.gz
gentoo-279f37e6f42a9ee83d797c8ca350aaf7ac7279e9.tar.bz2
gentoo-279f37e6f42a9ee83d797c8ca350aaf7ac7279e9.zip
multilib.eclass: store EAPI=0 support used by crossdev
Reported-by: Marco Scardovi (scardracs) Bug: https://bugs.gentoo.org/797367 Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-rw-r--r--eclass/multilib.eclass5
1 files changed, 3 insertions, 2 deletions
diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index 29acc7f5fba9..6ba820229de3 100644
--- a/eclass/multilib.eclass
+++ b/eclass/multilib.eclass
@@ -10,7 +10,8 @@
# This eclass is for all functions pertaining to handling multilib configurations.
case ${EAPI:-0} in
- [567]) ;;
+ # EAPI=0 is still used by crossdev, bug #797367
+ [0567]) ;;
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac
@@ -53,7 +54,7 @@ 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...
-if [[ ${EAPI} == 5 ]] ; then
+if [[ ${EAPI} == [05] ]] ; then
get_libdir() {
local CONF_LIBDIR
if [ -n "${CONF_LIBDIR_OVERRIDE}" ] ; then