From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EC294158287 for ; Sat, 17 May 2025 00:40:06 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id D8BEF3430FF for ; Sat, 17 May 2025 00:40:06 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id CE20B1103C0; Sat, 17 May 2025 00:40:05 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id C31C71103C0 for ; Sat, 17 May 2025 00:40:05 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 74944343077 for ; Sat, 17 May 2025 00:40:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D0F9CFB9 for ; Sat, 17 May 2025 00:40:03 +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: <1747442331.e8fffecfe81cca5b226714578fe7ba7a6c8de4ee.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.6.4-r1.ebuild app-arch/xz-utils/xz-utils-5.6.4-r2.ebuild app-arch/xz-utils/xz-utils-5.8.1-r1.ebuild app-arch/xz-utils/xz-utils-5.8.1.ebuild X-VCS-Directories: app-arch/xz-utils/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e8fffecfe81cca5b226714578fe7ba7a6c8de4ee X-VCS-Branch: master Date: Sat, 17 May 2025 00:40:03 +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: d1ac13de-1c21-49ba-b53c-20393a559870 X-Archives-Hash: f365a399ef5c98458795c0dcc0b0ae3b commit: e8fffecfe81cca5b226714578fe7ba7a6c8de4ee Author: Sam James gentoo org> AuthorDate: Sat May 17 00:38:51 2025 +0000 Commit: Sam James gentoo org> CommitDate: Sat May 17 00:38:51 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8fffecf app-arch/xz-utils: revbump to propagate PGO fix, backport to 5.6.4 too * Revbump to propagate PGO fix (see 7ab9960e9837bdaadb5da7344994f612f5f8672e) as we don't expect a new release soon. * Backport 5.8.1 ebuild changes to 5.6.4. Signed-off-by: Sam James gentoo.org> ...xz-utils-5.6.4-r1.ebuild => xz-utils-5.6.4-r2.ebuild} | 16 +++++++++++++--- .../{xz-utils-5.8.1.ebuild => xz-utils-5.8.1-r1.ebuild} | 0 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/app-arch/xz-utils/xz-utils-5.6.4-r1.ebuild b/app-arch/xz-utils/xz-utils-5.6.4-r2.ebuild similarity index 89% rename from app-arch/xz-utils/xz-utils-5.6.4-r1.ebuild rename to app-arch/xz-utils/xz-utils-5.6.4-r2.ebuild index 05d8d6426409..63e7fa8d6656 100644 --- a/app-arch/xz-utils/xz-utils-5.6.4-r1.ebuild +++ b/app-arch/xz-utils/xz-utils-5.6.4-r2.ebuild @@ -6,7 +6,7 @@ EAPI=8 -inherit libtool multilib multilib-minimal preserve-libs toolchain-funcs +inherit dot-a flag-o-matic libtool multilib multilib-minimal preserve-libs toolchain-funcs if [[ ${PV} == 9999 ]] ; then # Per tukaani.org, git.tukaani.org is a mirror of github and @@ -71,6 +71,11 @@ src_prepare() { fi } +src_configure() { + use static-libs && lto-guarantee-fat + multilib-minimal_src_configure +} + multilib_src_configure() { local myconf=( --enable-threads @@ -113,8 +118,11 @@ multilib_src_configure() { } multilib_src_compile() { - local pgo_generate_flags=$(usev pgo "-fprofile-update=atomic -fprofile-dir=${T}/${ABI}-pgo -fprofile-generate=${T}/${ABI}-pgo") - local pgo_use_flags=$(usev pgo "-fprofile-use=${T}/${ABI}-pgo -fprofile-dir=${T}/${ABI}-pgo") + # -fprofile-partial-training because upstream note the test suite isn't super comprehensive + # TODO: revisit that now we have the tar/xz loop below? + # 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}" @@ -189,6 +197,8 @@ multilib_src_install() { } multilib_src_install_all() { + strip-lto-bytecode + find "${ED}" -type f -name '*.la' -delete || die if use doc ; then diff --git a/app-arch/xz-utils/xz-utils-5.8.1.ebuild b/app-arch/xz-utils/xz-utils-5.8.1-r1.ebuild similarity index 100% rename from app-arch/xz-utils/xz-utils-5.8.1.ebuild rename to app-arch/xz-utils/xz-utils-5.8.1-r1.ebuild