From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8D85E1382C5 for ; Wed, 31 Mar 2021 07:33:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7C45FE0831; Wed, 31 Mar 2021 07:33:26 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 38104E0822 for ; Wed, 31 Mar 2021 07:33:26 +0000 (UTC) Date: Wed, 31 Mar 2021 08:33:21 +0100 From: Sergei Trofimovich To: Andreas Sturmlechner Cc: gentoo-dev@lists.gentoo.org Subject: Re: [gentoo-dev] [PATCH] flag-o-matic.eclass: get rid of eutils in In-Reply-To: <5252907.rdbgypaU67@tuxbook> References: <5252907.rdbgypaU67@tuxbook> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.32; x86_64-pc-linux-gnu) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Archives-Salt: c30ecc78-df0b-407c-a101-b97e9bcfeb6f X-Archives-Hash: da4beaca4f584df835fb27d1a60d927c On Wed, 31 Mar 2021 08:39:27 +0200 Andreas Sturmlechner wrote: > qa-reports showing >7300 ebuilds with EAPI-7 using eutils.eclass, that can't be right. > > - Restrict inherit eutils to - Drop bogus multilib.eclass (inherited by toolchain-funcs.eclass anyway) > - Several functions look like they should be internal > - Fix eclassdoc issues, add missing docu > > See also: > https://qa-reports.gentoo.org/output/eapi-per-eclass/eutils.eclass/ > https://github.com/gentoo/gentoo/pull/20207 Please post series as separate patches. > diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass > index 20ee39d98ba..35dc09f94de 100644 > --- a/eclass/flag-o-matic.eclass > +++ b/eclass/flag-o-matic.eclass > @@ -1,4 +1,4 @@ > -# Copyright 1999-2020 Gentoo Authors > +# Copyright 1999-2021 Gentoo Authors > # Distributed under the terms of the GNU General Public License v2 > > # @ECLASS: flag-o-matic.eclass > @@ -12,16 +12,37 @@ > if [[ -z ${_FLAG_O_MATIC_ECLASS} ]]; then > _FLAG_O_MATIC_ECLASS=1 > > -inherit eutils toolchain-funcs multilib > +inherit toolchain-funcs > > +case ${EAPI} in > + [0-7]) inherit eutils ;; > + *) ;; > +esac > + > +# @FUNCTION: all-flag-vars > +# @DESCRIPTION: > # Return all the flag variables that our high level funcs operate on. > all-flag-vars() { > echo {ADA,C,CPP,CXX,CCAS,F,FC,LD}FLAGS > } > > +# @FUNCTION: setup-allowed-flags > +# @INTERNAL > +# @DESCRIPTION: > # {C,CPP,CXX,CCAS,F,FC,LD}FLAGS that we allow in strip-flags > # Note: shell globs and character lists are allowed > setup-allowed-flags() { > + [[ ${EAPI} == [0-7] ]] || > + die "Internal function ${FUNCNAME} is not available in >=EAPI-8." > + _setup-allowed-flags > +} > + > +# @FUNCTION: _setup-allowed-flags > +# @INTERNAL > +# @DESCRIPTION: > +# {C,CPP,CXX,CCAS,F,FC,LD}FLAGS that we allow in strip-flags > +# Note: shell globs and character lists are allowed > +_setup-allowed-flags() { > ALLOWED_FLAGS=( > -pipe -O '-O[12sg]' -mcpu -march -mtune > '-fstack-protector*' '-fsanitize*' '-fstack-check*' -fno-stack-check > @@ -87,7 +108,10 @@ setup-allowed-flags() { > ) > } > > -# inverted filters for hardened compiler. This is trying to unpick > +# @FUNCTION: _filter-hardened > +# @INTERNAL > +# @DESCRIPTION: > +# Inverted filters for hardened compiler. This is trying to unpick > # the hardened compiler defaults. > _filter-hardened() { > local f > @@ -121,6 +145,9 @@ _filter-hardened() { > done > } > > +# @FUNCTION: _filter-var > +# @INTERNAL > +# @DESCRIPTION: > # Remove occurrences of strings from variable given in $1 > # Strings removed are matched as globs, so for example > # '-O*' would remove -O1, -O2 etc. > @@ -313,6 +340,11 @@ replace-cpu-flags() { > return 0 > } > > +# @FUNCTION: _is_flagq > +# @USAGE: > +# @INTERNAL > +# @DESCRIPTION: > +# Returns shell true if is in a given , else returns shell false. > _is_flagq() { > local x var="$1[*]" > for x in ${!var} ; do > @@ -405,7 +437,7 @@ strip-flags() { > local x y var > > local ALLOWED_FLAGS > - setup-allowed-flags > + _setup-allowed-flags > > set -f # disable pathname expansion > > @@ -438,7 +470,23 @@ strip-flags() { > return 0 > } > > +# @FUNCTION: test-flag-PROG > +# @USAGE: > +# @INTERNAL > +# @DESCRIPTION: > +# Returns shell true if is supported by given , else returns shell false. > test-flag-PROG() { > + [[ ${EAPI} == [0-7] ]] || > + die "Internal function ${FUNCNAME} is not available in >=EAPI-8." > + _test-flag-PROG > +} > + > +# @FUNCTION: _test-flag-PROG > +# @USAGE: > +# @INTERNAL > +# @DESCRIPTION: > +# Returns shell true if is supported by given , else returns shell false. > +_test-flag-PROG() { > local comp=$1 > local lang=$2 > shift 2 > @@ -533,33 +581,49 @@ test-flag-PROG() { > # @USAGE: > # @DESCRIPTION: > # Returns shell true if is supported by the C compiler, else returns shell false. > -test-flag-CC() { test-flag-PROG "CC" c "$@"; } > +test-flag-CC() { _test-flag-PROG "CC" c "$@"; } > > # @FUNCTION: test-flag-CXX > # @USAGE: > # @DESCRIPTION: > # Returns shell true if is supported by the C++ compiler, else returns shell false. > -test-flag-CXX() { test-flag-PROG "CXX" c++ "$@"; } > +test-flag-CXX() { _test-flag-PROG "CXX" c++ "$@"; } > > # @FUNCTION: test-flag-F77 > # @USAGE: > # @DESCRIPTION: > # Returns shell true if is supported by the Fortran 77 compiler, else returns shell false. > -test-flag-F77() { test-flag-PROG "F77" f77 "$@"; } > +test-flag-F77() { _test-flag-PROG "F77" f77 "$@"; } > > # @FUNCTION: test-flag-FC > # @USAGE: > # @DESCRIPTION: > # Returns shell true if is supported by the Fortran 90 compiler, else returns shell false. > -test-flag-FC() { test-flag-PROG "FC" f95 "$@"; } > +test-flag-FC() { _test-flag-PROG "FC" f95 "$@"; } > > # @FUNCTION: test-flag-CCLD > # @USAGE: > # @DESCRIPTION: > # Returns shell true if is supported by the C compiler and linker, else returns shell false. > -test-flag-CCLD() { test-flag-PROG "CC" c+ld "$@"; } > +test-flag-CCLD() { _test-flag-PROG "CC" c+ld "$@"; } > > +# @FUNCTION: test-flags-PROG > +# @USAGE: [more flags...] > +# @INTERNAL > +# @DESCRIPTION: > +# Returns shell true if are supported by given , else returns shell false. > test-flags-PROG() { > + [[ ${EAPI} == [0-7] ]] || > + die "Internal function ${FUNCNAME} is not available in >=EAPI-8." > + _test-flags-PROG > +} > + > +# @FUNCTION: _test-flags-PROG > +# @USAGE: [more flags...] > +# @INTERNAL > +# @DESCRIPTION: > +# Returns shell true if are supported by given , else returns shell false. > +_test-flags-PROG() { > local comp=$1 > local flags=() > local x > @@ -596,31 +660,31 @@ test-flags-PROG() { > # @USAGE: > # @DESCRIPTION: > # Returns shell true if are supported by the C compiler, else returns shell false. > -test-flags-CC() { test-flags-PROG "CC" "$@"; } > +test-flags-CC() { _test-flags-PROG "CC" "$@"; } > > # @FUNCTION: test-flags-CXX > # @USAGE: > # @DESCRIPTION: > # Returns shell true if are supported by the C++ compiler, else returns shell false. > -test-flags-CXX() { test-flags-PROG "CXX" "$@"; } > +test-flags-CXX() { _test-flags-PROG "CXX" "$@"; } > > # @FUNCTION: test-flags-F77 > # @USAGE: > # @DESCRIPTION: > # Returns shell true if are supported by the Fortran 77 compiler, else returns shell false. > -test-flags-F77() { test-flags-PROG "F77" "$@"; } > +test-flags-F77() { _test-flags-PROG "F77" "$@"; } > > # @FUNCTION: test-flags-FC > # @USAGE: > # @DESCRIPTION: > # Returns shell true if are supported by the Fortran 90 compiler, else returns shell false. > -test-flags-FC() { test-flags-PROG "FC" "$@"; } > +test-flags-FC() { _test-flags-PROG "FC" "$@"; } > > # @FUNCTION: test-flags-CCLD > # @USAGE: > # @DESCRIPTION: > # Returns shell true if are supported by the C compiler and default linker, else returns shell false. > -test-flags-CCLD() { test-flags-PROG "CCLD" "$@"; } > +test-flags-CCLD() { _test-flags-PROG "CCLD" "$@"; } > > # @FUNCTION: test-flags > # @USAGE: -- Sergei