[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

[Sam James]

commit:     5e95594973108f1836a35efec996cfbd69e209c0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 12 12:11:50 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 12 12:13:01 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e955949

app-arch/xz-utils: tidy up PGO bits

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-arch/xz-utils/xz-utils-5.4.4.ebuild | 3 ++-
 app-arch/xz-utils/xz-utils-9999.ebuild  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.4.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.4.ebuild
index b51831556293..f5305d400724 100644
--- a/app-arch/xz-utils/xz-utils-5.4.4.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.4.ebuild
@@ -107,6 +107,7 @@ multilib_src_compile() {
        # -fprofile-partial-training because upstream note the test suite isn't 
super comprehensive
        # See 
https://documentation.suse.com/sbp/all/html/SBP-GCC-10/index.html#sec-gcc10-pgo
        local pgo_generate_flags=$(usev pgo "-fprofile-update=atomic 
-fprofile-dir=${T}/${ABI}-pgo -fprofile-generate=${T}/${ABI}-pgo 
$(test-flags-CC -fprofile-partial-training)")
+       local pgo_use_flags=$(usev pgo "-fprofile-use=${T}/${ABI}-pgo 
-fprofile-dir=${T}/${ABI}-pgo $(test-flags-CC -fprofile-partial-training)")
 
        emake CFLAGS="${CFLAGS} ${pgo_generate_flags}"
 
@@ -118,7 +119,7 @@ multilib_src_compile() {
                fi
 
                emake clean
-               emake CFLAGS="${CFLAGS} -fprofile-use=${T}/${ABI}-pgo 
-fprofile-dir=${T}/${ABI}-pgo"
+               emake CFLAGS="${CFLAGS} ${pgo_use_flags}"
        fi
 }
 

diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild 
b/app-arch/xz-utils/xz-utils-9999.ebuild
index b51831556293..f5305d400724 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -107,6 +107,7 @@ multilib_src_compile() {
        # -fprofile-partial-training because upstream note the test suite isn't 
super comprehensive
        # See 
https://documentation.suse.com/sbp/all/html/SBP-GCC-10/index.html#sec-gcc10-pgo
        local pgo_generate_flags=$(usev pgo "-fprofile-update=atomic 
-fprofile-dir=${T}/${ABI}-pgo -fprofile-generate=${T}/${ABI}-pgo 
$(test-flags-CC -fprofile-partial-training)")
+       local pgo_use_flags=$(usev pgo "-fprofile-use=${T}/${ABI}-pgo 
-fprofile-dir=${T}/${ABI}-pgo $(test-flags-CC -fprofile-partial-training)")
 
        emake CFLAGS="${CFLAGS} ${pgo_generate_flags}"
 
@@ -118,7 +119,7 @@ multilib_src_compile() {
                fi
 
                emake clean
-               emake CFLAGS="${CFLAGS} -fprofile-use=${T}/${ABI}-pgo 
-fprofile-dir=${T}/${ABI}-pgo"
+               emake CFLAGS="${CFLAGS} ${pgo_use_flags}"
        fi
 }