From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1709659-garchives=archives.gentoo.org@lists.gentoo.org>
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 (4096 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id C422115813A
for <garchives@archives.gentoo.org>; Wed, 15 Jan 2025 19:38:43 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id EE456E0794;
Wed, 15 Jan 2025 19:38:42 +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) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id D45E2E0794
for <gentoo-commits@lists.gentoo.org>; Wed, 15 Jan 2025 19:38:42 +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 C29453430F0
for <gentoo-commits@lists.gentoo.org>; Wed, 15 Jan 2025 19:38:41 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 527722078
for <gentoo-commits@lists.gentoo.org>; Wed, 15 Jan 2025 19:38:40 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
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" <sam@gentoo.org>
Message-ID: <1736969860.ae18c5b4149e30064751e7cea79cc830076b0292.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
X-VCS-Repository: repo/gentoo
X-VCS-Files: eclass/toolchain.eclass
X-VCS-Directories: eclass/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: ae18c5b4149e30064751e7cea79cc830076b0292
X-VCS-Branch: master
Date: Wed, 15 Jan 2025 19:38:40 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 4cb897c4-3172-4990-9d5a-e2b7db3542c9
X-Archives-Hash: 7e1f9d1922d2c94ac2c632f8a29cc5aa
commit: ae18c5b4149e30064751e7cea79cc830076b0292
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 15 19:37:40 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 15 19:37:40 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae18c5b4
toolchain.eclass: fix toolchain_death_notice more
* Go back to -arf. As Marcus points out, it doesn't make sense to append
there.
* Compress afterwards given we want to handle both directories.
Bug: https://bugs.gentoo.org/948045
Signed-off-by: Sam James <sam <AT> gentoo.org>
eclass/toolchain.eclass | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 86302f3bcb4a..ad4703fc550e 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -3159,7 +3159,7 @@ toolchain_death_notice() {
pushd "${WORKDIR}" >/dev/null
(echo '' | $(tc-getCC ${CTARGET}) ${CFLAGS} -v -E - 2>&1) > "${dir}"/gccinfo.log
[[ -e "${T}"/build.log ]] && cp "${T}"/build.log "${dir}"
- tar -carf "${WORKDIR}"/gcc-build-logs.tar.xz \
+ tar -arf "${WORKDIR}"/gcc-build-logs.tar.xz \
"${dir#${WORKDIR}/}"/gccinfo.log "${dir#${WORKDIR}/}"/build.log $(find -name "${dir#${WORKDIR}/}"/config.log)
rm "${dir#${WORKDIR}/}"/gccinfo.log "${dir#${WORKDIR}/}"/build.log
eerror
@@ -3168,6 +3168,7 @@ toolchain_death_notice() {
popd >/dev/null
fi
done
+ xz -9e "${WORKDIR}"/gcc-build-logs.tar.xz
}
fi