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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CB1041382C5 for ; Sat, 27 Jun 2020 09:21:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A7BFCE08DC; Sat, 27 Jun 2020 09:21:33 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 712EBE08DC for ; Sat, 27 Jun 2020 09:21:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 38B1534EF5B for ; Sat, 27 Jun 2020 09:21:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B8BB12A5 for ; Sat, 27 Jun 2020 09:21:30 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1593249687.068ded854ecce99aa28cb5bbd78f16769aaccf3a.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/files/, dev-util/ccache/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/ccache/ccache-3.7.10.ebuild dev-util/ccache/files/ccache-3.7.10-objdump.patch X-VCS-Directories: dev-util/ccache/ dev-util/ccache/files/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 068ded854ecce99aa28cb5bbd78f16769aaccf3a X-VCS-Branch: master Date: Sat, 27 Jun 2020 09:21:30 +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: 056398b1-c934-4bcf-b2e4-230867ef2c8d X-Archives-Hash: 516666c2039a62b14d2cd993e882c585 commit: 068ded854ecce99aa28cb5bbd78f16769aaccf3a Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Jun 27 09:21:17 2020 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Jun 27 09:21:27 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=068ded85 dev-util/ccache: use ${CHOST}-objdump Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Sergei Trofimovich gentoo.org> dev-util/ccache/ccache-3.7.10.ebuild | 6 ++++++ dev-util/ccache/files/ccache-3.7.10-objdump.patch | 15 +++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/dev-util/ccache/ccache-3.7.10.ebuild b/dev-util/ccache/ccache-3.7.10.ebuild index 32f24f67e07..900d8f39d69 100644 --- a/dev-util/ccache/ccache-3.7.10.ebuild +++ b/dev-util/ccache/ccache-3.7.10.ebuild @@ -3,6 +3,8 @@ EAPI=7 +inherit toolchain-funcs + DESCRIPTION="fast compiler cache" HOMEPAGE="https://ccache.dev/" SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.tar.xz" @@ -26,6 +28,7 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}"/${PN}-3.5-nvcc-test.patch + "${FILESDIR}"/${P}-objdump.patch ) src_prepare() { @@ -34,6 +37,9 @@ src_prepare() { sed \ -e "/^EPREFIX=/s:'':'${EPREFIX}':" \ "${FILESDIR}"/ccache-config-3 > ccache-config || die + + # mainly used in tests + tc-export OBJDUMP } src_configure() { diff --git a/dev-util/ccache/files/ccache-3.7.10-objdump.patch b/dev-util/ccache/files/ccache-3.7.10-objdump.patch new file mode 100644 index 00000000000..bad334a5c54 --- /dev/null +++ b/dev-util/ccache/files/ccache-3.7.10-objdump.patch @@ -0,0 +1,15 @@ +Allow ${CHOST}-objdump (or any other override) +--- a/test/suites/debug_prefix_map.bash ++++ b/test/suites/debug_prefix_map.bash +@@ -24,9 +24,9 @@ objdump_cmd() { + if $HOST_OS_APPLE; then + xcrun dwarfdump -r0 $1 + elif $HOST_OS_FREEBSD; then +- objdump -W $1 ++ ${OBJDUMP-objdump} -W $1 + else +- objdump -g $1 ++ ${OBJDUMP-objdump} -g $1 + fi + } +