| 1 |
commit: e73c67e48bea075aa46babf1a0ffbfe026b2a3dc |
| 2 |
Author: David Michael <fedora.dm0 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Jun 26 20:43:08 2021 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 2 15:32:33 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e73c67e4 |
| 7 |
|
| 8 |
multilib-build.eclass: EAPI 8 support |
| 9 |
|
| 10 |
Also drop EAPI 4 to match multilib.eclass. |
| 11 |
|
| 12 |
Signed-off-by: David Michael <fedora.dm0 <AT> gmail.com> |
| 13 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 14 |
|
| 15 |
eclass/multilib-build.eclass | 21 ++++++++++----------- |
| 16 |
1 file changed, 10 insertions(+), 11 deletions(-) |
| 17 |
|
| 18 |
diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass |
| 19 |
index 8ba055c603b..e3e8730904a 100644 |
| 20 |
--- a/eclass/multilib-build.eclass |
| 21 |
+++ b/eclass/multilib-build.eclass |
| 22 |
@@ -6,7 +6,7 @@ |
| 23 |
# Michał Górny <mgorny@g.o> |
| 24 |
# @AUTHOR: |
| 25 |
# Author: Michał Górny <mgorny@g.o> |
| 26 |
-# @SUPPORTED_EAPIS: 4 5 6 7 |
| 27 |
+# @SUPPORTED_EAPIS: 5 6 7 8 |
| 28 |
# @BLURB: flags and utility functions for building multilib packages |
| 29 |
# @DESCRIPTION: |
| 30 |
# The multilib-build.eclass exports USE flags and utility functions |
| 31 |
@@ -17,15 +17,15 @@ |
| 32 |
# dependencies shall use the USE dependency string in ${MULTILIB_USEDEP} |
| 33 |
# to properly request multilib enabled. |
| 34 |
|
| 35 |
-if [[ ! ${_MULTILIB_BUILD} ]]; then |
| 36 |
- |
| 37 |
-# EAPI=4 is required for meaningful MULTILIB_USEDEP. |
| 38 |
-case ${EAPI:-0} in |
| 39 |
- 4|5|6|7) ;; |
| 40 |
- *) die "EAPI=${EAPI} is not supported" ;; |
| 41 |
+case ${EAPI} in |
| 42 |
+ 5|6|7|8) ;; |
| 43 |
+ *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; |
| 44 |
esac |
| 45 |
|
| 46 |
-[[ ${EAPI} == [45] ]] && inherit eutils |
| 47 |
+if [[ -z ${_MULTILIB_BUILD} ]]; then |
| 48 |
+_MULTILIB_BUILD=1 |
| 49 |
+ |
| 50 |
+[[ ${EAPI} == 5 ]] && inherit eutils |
| 51 |
inherit multibuild multilib |
| 52 |
|
| 53 |
# @ECLASS-VARIABLE: _MULTILIB_FLAGS |
| 54 |
@@ -250,7 +250,7 @@ multilib_parallel_foreach_abi() { |
| 55 |
multilib_for_best_abi() { |
| 56 |
debug-print-function ${FUNCNAME} "${@}" |
| 57 |
|
| 58 |
- [[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}, use multilib_is_native_abi() instead" |
| 59 |
+ [[ ${EAPI} == 5 ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}, use multilib_is_native_abi() instead" |
| 60 |
|
| 61 |
eqawarn "QA warning: multilib_for_best_abi() function is deprecated and should" |
| 62 |
eqawarn "not be used. The multilib_is_native_abi() check may be used instead." |
| 63 |
@@ -588,7 +588,7 @@ multilib_is_native_abi() { |
| 64 |
multilib_build_binaries() { |
| 65 |
debug-print-function ${FUNCNAME} "${@}" |
| 66 |
|
| 67 |
- [[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}, use multilib_is_native_abi() instead" |
| 68 |
+ [[ ${EAPI} == 5 ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}, use multilib_is_native_abi() instead" |
| 69 |
|
| 70 |
eqawarn "QA warning: multilib_build_binaries is deprecated. Please use the equivalent" |
| 71 |
eqawarn "multilib_is_native_abi function instead." |
| 72 |
@@ -671,5 +671,4 @@ multilib_native_usex() { |
| 73 |
fi |
| 74 |
} |
| 75 |
|
| 76 |
-_MULTILIB_BUILD=1 |
| 77 |
fi |
Archives