| 1 |
>>>>> On Thu, 24 Jun 2021, David Michael wrote: |
| 2 |
|
| 3 |
> --- a/eclass/ninja-utils.eclass |
| 4 |
> +++ b/eclass/ninja-utils.eclass |
| 5 |
> @@ -1,4 +1,4 @@ |
| 6 |
> -# Copyright 1999-2018 Gentoo Foundation |
| 7 |
> +# Copyright 1999-2021 Gentoo Foundation |
| 8 |
|
| 9 |
Please update to "Gentoo Authors". |
| 10 |
|
| 11 |
> # Distributed under the terms of the GNU General Public License v2 |
| 12 |
> |
| 13 |
> # @ECLASS: ninja-utils.eclass |
| 14 |
> @@ -8,7 +8,7 @@ |
| 15 |
> # @AUTHOR: |
| 16 |
> # Michał Górny <mgorny@g.o> |
| 17 |
> # Mike Gilbert <floppym@g.o> |
| 18 |
> -# @SUPPORTED_EAPIS: 2 4 5 6 7 |
| 19 |
> +# @SUPPORTED_EAPIS: 5 6 7 8 |
| 20 |
> # @BLURB: common bits to run dev-util/ninja builder |
| 21 |
> # @DESCRIPTION: |
| 22 |
> # This eclass provides a single function -- eninja -- that can be used |
| 23 |
> @@ -21,10 +21,8 @@ |
| 24 |
> if [[ -z ${_NINJA_UTILS_ECLASS} ]]; then |
| 25 |
> |
| 26 |
> case ${EAPI:-0} in |
| 27 |
|
| 28 |
This could be simplified to "case ${EAPI} in". |
| 29 |
|
| 30 |
> - 0|1|3) die "EAPI=${EAPI:-0} is not supported (too old)";; |
| 31 |
> - # copied from cmake-utils |
| 32 |
> - 2|4|5|6|7) ;; |
| 33 |
> - *) die "EAPI=${EAPI} is not yet supported" ;; |
| 34 |
> + 5|6|7|8) ;; |
| 35 |
> + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; |
| 36 |
> esac |
| 37 |
> |
| 38 |
> # @ECLASS-VARIABLE: NINJAOPTS |
| 39 |
> @@ -44,7 +42,7 @@ inherit multiprocessing |
| 40 |
> # with EAPI 6, it also supports being called via 'nonfatal'. |
| 41 |
> eninja() { |
| 42 |
> local nonfatal_args=() |
| 43 |
> - [[ ${EAPI:-0} != [245] ]] && nonfatal_args+=( -n ) |
| 44 |
> + [[ ${EAPI} != 5 ]] && nonfatal_args+=( -n ) |
| 45 |
> |
| 46 |
> if [[ -z ${NINJAOPTS+set} ]]; then |
| 47 |
> NINJAOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0)" |
Archives