diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2013-12-11 22:36:19 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2013-12-11 22:36:19 +0000 |
| commit | 074f25fccaaa497c4ea8cc2ef12354f3b93ac709 (patch) | |
| tree | 2def189a9b72ed0f9638b93b00fc2eaaa150b0f1 /dev-util/perf | |
| parent | Thanks to TomWij and mrueg for reporting: Add tasty-quickcheck-0.3.1 (diff) | |
| download | gentoo-2-074f25fccaaa497c4ea8cc2ef12354f3b93ac709.tar.gz gentoo-2-074f25fccaaa497c4ea8cc2ef12354f3b93ac709.tar.bz2 gentoo-2-074f25fccaaa497c4ea8cc2ef12354f3b93ac709.zip | |
Fix by Vincent Palatin to use tc-arch-kernel to get at the ARCH value.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
Diffstat (limited to 'dev-util/perf')
| -rw-r--r-- | dev-util/perf/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-util/perf/perf-3.12.ebuild | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/dev-util/perf/ChangeLog b/dev-util/perf/ChangeLog index a2f0b9f68dfb..96e0be47c3c9 100644 --- a/dev-util/perf/ChangeLog +++ b/dev-util/perf/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-util/perf # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/perf/ChangeLog,v 1.25 2013/11/17 06:44:21 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/perf/ChangeLog,v 1.26 2013/12/11 22:36:19 vapier Exp $ + + 11 Dec 2013; Mike Frysinger <vapier@gentoo.org> perf-3.12.ebuild: + Fix by Vincent Palatin to use tc-arch-kernel to get at the ARCH value. *perf-3.12 (17 Nov 2013) diff --git a/dev-util/perf/perf-3.12.ebuild b/dev-util/perf/perf-3.12.ebuild index 4d88881cf772..82d561672cc8 100644 --- a/dev-util/perf/perf-3.12.ebuild +++ b/dev-util/perf/perf-3.12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/perf/perf-3.12.ebuild,v 1.1 2013/11/17 06:44:21 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/perf/perf-3.12.ebuild,v 1.2 2013/12/11 22:36:19 vapier Exp $ EAPI="5" @@ -125,8 +125,12 @@ src_prepare() { puse() { usex $1 "" no; } perf_make() { - local arch=$(tc-arch) - [[ "${arch}" == "amd64" ]] && arch="x86_64" + # The arch parsing is a bit funky. The perf tools package is integrated + # into the kernel, so it wants an ARCH that looks like the kernel arch, + # but it also wants to know about the split value -- i386/x86_64 vs just + # x86. We can get that by telling the func to use an older linux version. + # It's kind of a hack, but not that bad ... + local arch=$(KV=2.6.23 tc-arch-kernel) emake -j1 V=1 \ CC="$(tc-getCC)" AR="$(tc-getAR)" \ prefix="/usr" bindir_relative="sbin" \ |