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 40F341581D3 for ; Fri, 31 May 2024 14:28:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0B894E2ABE; Fri, 31 May 2024 14:28:46 +0000 (UTC) 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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E241CE2ABE for ; Fri, 31 May 2024 14:28:45 +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 EAD9934067D for ; Fri, 31 May 2024 14:28:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5461F1B43 for ; Fri, 31 May 2024 14:28:43 +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: <1717165686.6fcd44ef37805c5c43770ca0f207d8a0bd99cb75.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.2.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: 6fcd44ef37805c5c43770ca0f207d8a0bd99cb75 X-VCS-Branch: master Date: Fri, 31 May 2024 14:28:43 +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: 2a6eacf3-b11a-4681-b9ce-b67c7d9002b2 X-Archives-Hash: 3d3ea1c6143515882659dd5cde8578d3 commit: 6fcd44ef37805c5c43770ca0f207d8a0bd99cb75 Author: Sam James gentoo org> AuthorDate: Fri May 31 14:28:06 2024 +0000 Commit: Sam James gentoo org> CommitDate: Fri May 31 14:28:06 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fcd44ef app-arch/xz-utils: fix PGO with libarchive tar Closes: https://bugs.gentoo.org/933200 Signed-off-by: Sam James gentoo.org> app-arch/xz-utils/xz-utils-5.6.2.ebuild | 9 +++++++-- app-arch/xz-utils/xz-utils-9999.ebuild | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/app-arch/xz-utils/xz-utils-5.6.2.ebuild b/app-arch/xz-utils/xz-utils-5.6.2.ebuild index 43e7da134e9a..687084d7fdae 100644 --- a/app-arch/xz-utils/xz-utils-5.6.2.ebuild +++ b/app-arch/xz-utils/xz-utils-5.6.2.ebuild @@ -116,17 +116,22 @@ multilib_src_compile() { if use pgo ; then emake CFLAGS="${CFLAGS} ${pgo_generate_flags}" -k check + local tar_pgo_args=( + --mtime=@2718281828 + ) + has_version "app-alternatives/tar[gnu]" && tar_pgo_args+=( --sort=name ) + if multilib_is_native_abi ; then ( shopt -s globstar tar \ - --sort=name --mtime=@2718281828 \ + "${tar_pgo_args[@]}" \ -cf xz-pgo-test-01.tar \ {"${S}","${BUILD_DIR}"}/**/*.[cho] \ {"${S}","${BUILD_DIR}"}/**/*.so* \ {"${S}","${BUILD_DIR}"}/**/**.txt \ - {"${S}","${BUILD_DIR}"}/tests/files \ + {"${S}","${BUILD_DIR}"}/tests/files stat --printf="xz-pgo-test-01.tar.tar size: %s\n" xz-pgo-test-01.tar md5sum xz-pgo-test-01.tar diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild index 43e7da134e9a..687084d7fdae 100644 --- a/app-arch/xz-utils/xz-utils-9999.ebuild +++ b/app-arch/xz-utils/xz-utils-9999.ebuild @@ -116,17 +116,22 @@ multilib_src_compile() { if use pgo ; then emake CFLAGS="${CFLAGS} ${pgo_generate_flags}" -k check + local tar_pgo_args=( + --mtime=@2718281828 + ) + has_version "app-alternatives/tar[gnu]" && tar_pgo_args+=( --sort=name ) + if multilib_is_native_abi ; then ( shopt -s globstar tar \ - --sort=name --mtime=@2718281828 \ + "${tar_pgo_args[@]}" \ -cf xz-pgo-test-01.tar \ {"${S}","${BUILD_DIR}"}/**/*.[cho] \ {"${S}","${BUILD_DIR}"}/**/*.so* \ {"${S}","${BUILD_DIR}"}/**/**.txt \ - {"${S}","${BUILD_DIR}"}/tests/files \ + {"${S}","${BUILD_DIR}"}/tests/files stat --printf="xz-pgo-test-01.tar.tar size: %s\n" xz-pgo-test-01.tar md5sum xz-pgo-test-01.tar