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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8053B158089 for ; Thu, 12 Oct 2023 12:13:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7DE602BC017; Thu, 12 Oct 2023 12:13:19 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 663622BC017 for ; Thu, 12 Oct 2023 12:13:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7F7C9335C20 for ; Thu, 12 Oct 2023 12:13:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 10D92EC5 for ; Thu, 12 Oct 2023 12:13:17 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1697112781.5e95594973108f1836a35efec996cfbd69e209c0.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-arch/xz-utils/xz-utils-5.4.4.ebuild app-arch/xz-utils/xz-utils-9999.ebuild X-VCS-Directories: app-arch/xz-utils/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5e95594973108f1836a35efec996cfbd69e209c0 X-VCS-Branch: master Date: Thu, 12 Oct 2023 12:13:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a07decfe-47db-4acd-81bc-883976fdb024 X-Archives-Hash: ca648a06737d8308f8881c67c86c26b6 commit: 5e95594973108f1836a35efec996cfbd69e209c0 Author: Sam James gentoo org> AuthorDate: Thu Oct 12 12:11:50 2023 +0000 Commit: Sam James gentoo 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 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 }