Mailing List Archive: [PATCH v2 4/7] distutils-r1.eclass: Make vars local before calling filter-lto

[PATCH v2 4/7] distutils-r1.eclass: Make vars local before calling filter-lto

Mar 5, 2024, 9:16 AM

Post #1 of 3 (163 views)

Make LTO filtering local to the compilation code. This avoids disabling
LTO for non-Python parts of an ebuild.

Signed-off-by: Micha? Górny <mgorny@gentoo.org>
---
eclass/distutils-r1.eclass | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index ee1dcef24ff6..134cb39f276a 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -1828,6 +1828,10 @@ distutils-r1_run_phase() {
# Rust extensions are incompatible with C/C++ LTO compiler
# see e.g. https://bugs.gentoo.org/910220
if has cargo ${INHERITED}; then
+ local x
+ for x in $(all-flag-vars); do
+ local -x "${x}=${!x}"
+ done
filter-lto
fi
fi
--
2.44.0

Re: [PATCH v2 4/7] distutils-r1.eclass: Make vars local before calling filter-lto [ In reply to ]

floppym at gentoo

Mar 9, 2024, 11:59 AM

Post #2 of 3 (141 views)

Permalink

On Tue, Mar 5, 2024 at 12:16?PM Micha? Górny <mgorny@gentoo.org> wrote:
>
> Make LTO filtering local to the compilation code. This avoids disabling
> LTO for non-Python parts of an ebuild.
>
> Signed-off-by: Micha? Górny <mgorny@gentoo.org>
> ---
> eclass/distutils-r1.eclass | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
> index ee1dcef24ff6..134cb39f276a 100644
> --- a/eclass/distutils-r1.eclass
> +++ b/eclass/distutils-r1.eclass
> @@ -1828,6 +1828,10 @@ distutils-r1_run_phase() {
> # Rust extensions are incompatible with C/C++ LTO compiler
> # see e.g. https://bugs.gentoo.org/910220
> if has cargo ${INHERITED}; then
> + local x
> + for x in $(all-flag-vars); do
> + local -x "${x}=${!x}"
> + done
> filter-lto
> fi
> fi

I had never thought to loop over all-flag-vars like this. Added to my
mental code repo, thanks!

Re: [PATCH v2 4/7] distutils-r1.eclass: Make vars local before calling filter-lto [ In reply to ]

eschwartz93 at gmail

Mar 9, 2024, 5:58 PM

Post #3 of 3 (140 views)

Permalink

On 3/9/24 2:59 PM, Mike Gilbert wrote:
> On Tue, Mar 5, 2024 at 12:16?PM Micha? Górny <mgorny@gentoo.org> wrote:
>>
>> Make LTO filtering local to the compilation code. This avoids disabling
>> LTO for non-Python parts of an ebuild.
>>
>> Signed-off-by: Micha? Górny <mgorny@gentoo.org>
>> ---
>> eclass/distutils-r1.eclass | 4 ++++
>> 1 file changed, 4 insertions(+)
>>
>> diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
>> index ee1dcef24ff6..134cb39f276a 100644
>> --- a/eclass/distutils-r1.eclass
>> +++ b/eclass/distutils-r1.eclass
>> @@ -1828,6 +1828,10 @@ distutils-r1_run_phase() {
>> # Rust extensions are incompatible with C/C++ LTO compiler
>> # see e.g. https://bugs.gentoo.org/910220
>> if has cargo ${INHERITED}; then
>> + local x
>> + for x in $(all-flag-vars); do
>> + local -x "${x}=${!x}"
>> + done
>> filter-lto
>> fi
>> fi
>
> I had never thought to loop over all-flag-vars like this. Added to my
> mental code repo, thanks!

To be fair, when I suggested this in review of the patch it wasn't my
idea either. I shamelessly stole it from... flag-o-matic.eclass, where
it is used by filter-flags, replace-flags, is-flagq, strip-flags, get-flag.

filter-flags in turn is used by filter-lto, hence all-flag-vars is the
direct API that governs what variables filter-lto will modify. It seemed
fitting to single-source that information.

--
Eli Schwartz

Mailing List Archive

Mailing List Archive

Attached Files: