1 |
Signed-off-by: Ulrich Müller <ulm@g.o> |
2 |
--- |
3 |
eclass/multilib.eclass | 33 +++------------------------------ |
4 |
1 file changed, 3 insertions(+), 30 deletions(-) |
5 |
|
6 |
diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass |
7 |
index 8590bbdfbff0..e3c0d78a6e43 100644 |
8 |
--- a/eclass/multilib.eclass |
9 |
+++ b/eclass/multilib.eclass |
10 |
@@ -4,14 +4,13 @@ |
11 |
# @ECLASS: multilib.eclass |
12 |
# @MAINTAINER: |
13 |
# toolchain@g.o |
14 |
-# @SUPPORTED_EAPIS: 5 6 7 8 |
15 |
+# @SUPPORTED_EAPIS: 6 7 8 |
16 |
# @BLURB: This eclass is for all functions pertaining to handling multilib configurations. |
17 |
# @DESCRIPTION: |
18 |
# This eclass is for all functions pertaining to handling multilib configurations. |
19 |
|
20 |
-case ${EAPI:-0} in |
21 |
- # EAPI=0 is still used by crossdev, bug #797367 |
22 |
- 0|5|6|7|8) ;; |
23 |
+case ${EAPI} in |
24 |
+ 6|7|8) ;; |
25 |
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; |
26 |
esac |
27 |
|
28 |
@@ -40,32 +39,6 @@ has_multilib_profile() { |
29 |
[ -n "${MULTILIB_ABIS}" -a "${MULTILIB_ABIS}" != "${MULTILIB_ABIS/ /}" ] |
30 |
} |
31 |
|
32 |
-# @FUNCTION: get_libdir |
33 |
-# @RETURN: the libdir for the selected ABI |
34 |
-# @DESCRIPTION: |
35 |
-# This function simply returns the desired lib directory. With portage |
36 |
-# 2.0.51, we now have support for installing libraries to lib32/lib64 |
37 |
-# to accomidate the needs of multilib systems. It's no longer a good idea |
38 |
-# to assume all libraries will end up in lib. Replace any (sane) instances |
39 |
-# where lib is named directly with $(get_libdir) if possible. |
40 |
-# |
41 |
-# Jeremy Huddleston <eradicator@g.o> (23 Dec 2004): |
42 |
-# Added support for ${ABI} and ${DEFAULT_ABI}. If they're both not set, |
43 |
-# fall back on old behavior. Any profile that has these set should also |
44 |
-# depend on a newer version of portage (not yet released) which uses these |
45 |
-# over CONF_LIBDIR in econf, dolib, etc... |
46 |
-if [[ ${EAPI} == [05] ]] ; then |
47 |
- get_libdir() { |
48 |
- local CONF_LIBDIR |
49 |
- if [ -n "${CONF_LIBDIR_OVERRIDE}" ] ; then |
50 |
- # if there is an override, we want to use that... always. |
51 |
- echo ${CONF_LIBDIR_OVERRIDE} |
52 |
- else |
53 |
- get_abi_LIBDIR |
54 |
- fi |
55 |
- } |
56 |
-fi |
57 |
- |
58 |
# @FUNCTION: get_abi_var |
59 |
# @USAGE: <VAR> [ABI] |
60 |
# @RETURN: returns the value of ${<VAR>_<ABI>} which should be set in make.defaults |
61 |
-- |
62 |
2.35.1 |