diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2020-06-27 10:21:17 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2020-06-27 10:21:27 +0100 |
| commit | 068ded854ecce99aa28cb5bbd78f16769aaccf3a (patch) | |
| tree | 98cba0c41c55dda45bde8c88b1c63a1f313c94f2 | |
| parent | dev-ruby/net-sftp: cleanup (diff) | |
| download | gentoo-068ded854ecce99aa28cb5bbd78f16769aaccf3a.tar.gz gentoo-068ded854ecce99aa28cb5bbd78f16769aaccf3a.tar.bz2 gentoo-068ded854ecce99aa28cb5bbd78f16769aaccf3a.zip | |
dev-util/ccache: use ${CHOST}-objdump
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
| -rw-r--r-- | dev-util/ccache/ccache-3.7.10.ebuild | 6 | ||||
| -rw-r--r-- | dev-util/ccache/files/ccache-3.7.10-objdump.patch | 15 |
2 files changed, 21 insertions, 0 deletions
diff --git a/dev-util/ccache/ccache-3.7.10.ebuild b/dev-util/ccache/ccache-3.7.10.ebuild index 32f24f67e079..900d8f39d692 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 000000000000..bad334a5c546 --- /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 + } + |