forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
multilib-build.eclass: EAPI 8 support
Also drop EAPI 4 to match multilib.eclass. Signed-off-by: David Michael <[email protected]> Signed-off-by: Mike Gilbert <[email protected]>
- Loading branch information
Showing
1 changed file
with
10 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,7 +6,7 @@ | |
| # Michał Górny <[email protected]> | ||
| # @AUTHOR: | ||
| # Author: Michał Górny <[email protected]> | ||
| # @SUPPORTED_EAPIS: 4 5 6 7 | ||
| # @SUPPORTED_EAPIS: 5 6 7 8 | ||
| # @BLURB: flags and utility functions for building multilib packages | ||
| # @DESCRIPTION: | ||
| # The multilib-build.eclass exports USE flags and utility functions | ||
|
|
@@ -17,15 +17,15 @@ | |
| # dependencies shall use the USE dependency string in ${MULTILIB_USEDEP} | ||
| # to properly request multilib enabled. | ||
|
|
||
| if [[ ! ${_MULTILIB_BUILD} ]]; then | ||
|
|
||
| # EAPI=4 is required for meaningful MULTILIB_USEDEP. | ||
| case ${EAPI:-0} in | ||
| 4|5|6|7) ;; | ||
| *) die "EAPI=${EAPI} is not supported" ;; | ||
| case ${EAPI} in | ||
| 5|6|7|8) ;; | ||
| *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; | ||
| esac | ||
|
|
||
| [[ ${EAPI} == [45] ]] && inherit eutils | ||
| if [[ -z ${_MULTILIB_BUILD} ]]; then | ||
| _MULTILIB_BUILD=1 | ||
|
|
||
| [[ ${EAPI} == 5 ]] && inherit eutils | ||
| inherit multibuild multilib | ||
|
|
||
| # @ECLASS-VARIABLE: _MULTILIB_FLAGS | ||
|
|
@@ -250,7 +250,7 @@ multilib_parallel_foreach_abi() { | |
| multilib_for_best_abi() { | ||
| debug-print-function ${FUNCNAME} "${@}" | ||
|
|
||
| [[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}, use multilib_is_native_abi() instead" | ||
| [[ ${EAPI} == 5 ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}, use multilib_is_native_abi() instead" | ||
|
|
||
| eqawarn "QA warning: multilib_for_best_abi() function is deprecated and should" | ||
| eqawarn "not be used. The multilib_is_native_abi() check may be used instead." | ||
|
|
@@ -588,7 +588,7 @@ multilib_is_native_abi() { | |
| multilib_build_binaries() { | ||
| debug-print-function ${FUNCNAME} "${@}" | ||
|
|
||
| [[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}, use multilib_is_native_abi() instead" | ||
| [[ ${EAPI} == 5 ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}, use multilib_is_native_abi() instead" | ||
|
|
||
| eqawarn "QA warning: multilib_build_binaries is deprecated. Please use the equivalent" | ||
| eqawarn "multilib_is_native_abi function instead." | ||
|
|
@@ -671,5 +671,4 @@ multilib_native_usex() { | |
| fi | ||
| } | ||
|
|
||
| _MULTILIB_BUILD=1 | ||
| fi | ||