public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Robin H. Johnson" <robbat2@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/linux-misc-apps/
Date: Sat, 22 Aug 2015 20:41:53 +0000 (UTC)	[thread overview]
Message-ID: <1440276072.d5da422b82e6f9078d263094d9d40c3e7f630aee.robbat2@gentoo> (raw)

commit:     d5da422b82e6f9078d263094d9d40c3e7f630aee
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 22 20:27:46 2015 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Aug 22 20:41:12 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5da422b

Fix turbostat build & install.

Package-Manager: portage-2.2.18

 sys-apps/linux-misc-apps/linux-misc-apps-3.18.ebuild | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/sys-apps/linux-misc-apps/linux-misc-apps-3.18.ebuild b/sys-apps/linux-misc-apps/linux-misc-apps-3.18.ebuild
index be86d16..43f20ad 100644
--- a/sys-apps/linux-misc-apps/linux-misc-apps-3.18.ebuild
+++ b/sys-apps/linux-misc-apps/linux-misc-apps-3.18.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit versionator eutils toolchain-funcs linux-info autotools flag-o-matic
+inherit versionator eutils toolchain-funcs linux-info flag-o-matic
 
 DESCRIPTION="Misc tools bundled with kernel sources"
 HOMEPAGE="http://kernel.org/"
@@ -69,7 +69,7 @@ TARGETS_SIMPLE=(
 # These have a broken make install, no DESTDIR
 TARGET_MAKE_SIMPLE=(
 	tools/firewire:nosy-dump
-	tools/power/x86/turbostat:../../../../turbostat
+	tools/power/x86/turbostat:turbostat:../../../../turbostat
 	tools/power/x86/x86_energy_perf_policy:x86_energy_perf_policy
 	Documentation/misc-devices/mei:mei-amt-version
 )
@@ -133,8 +133,10 @@ src_compile() {
 	done
 
 	for t in ${TARGET_MAKE_SIMPLE[@]} ; do
-		dir=${t/:*} target=${t/*:}
-		einfo "Building $dir => $target"
+		dir=${t/:*} target_binfile=${t#*:}
+		target=${target_binfile/:*} binfile=${target_binfile/*:}
+		[ -z "${binfile}" ] && binfile=$target
+		einfo "Building $dir => $binfile (via emake $target)"
 		emake -C $dir ARCH=${karch} $target
 	done
 }
@@ -148,9 +150,11 @@ src_install() {
 	done
 
 	for t in ${TARGET_MAKE_SIMPLE[@]} ; do
-		dir=${t/:*} target=${t/*:}
-		einfo "Installing $dir => $target"
-		dosbin ${dir}/${target}
+		dir=${t/:*} target_binfile=${t#*:}
+		target=${target_binfile/:*} binfile=${target_binfile/*:}
+		[ -z "${binfile}" ] && binfile=$target
+		einfo "Installing $dir => $binfile"
+		dosbin ${dir}/${binfile}
 	done
 
 	newconfd "${FILESDIR}"/freefall.confd freefall


             reply	other threads:[~2015-08-22 20:41 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-22 20:41 Robin H. Johnson [this message]
  -- strict thread matches above, loose matches on Subject: below --
2016-03-10 16:11 [gentoo-commits] repo/gentoo:master commit in: sys-apps/linux-misc-apps/ Robin H. Johnson
2016-03-11  0:32 Robin H. Johnson
2016-03-11  0:46 Robin H. Johnson
2018-10-31 22:21 Robin H. Johnson
2018-11-27 21:17 Robin H. Johnson
2019-10-05 18:55 Michał Górny
2020-04-17 17:26 Robin H. Johnson
2020-04-17 18:43 Robin H. Johnson
2020-09-24 19:31 Robin H. Johnson
2020-09-24 20:22 Aaron Bauman
2021-03-03 17:40 Sam James
2021-03-03 17:40 Sam James
2021-03-09  9:44 Sam James
2021-04-03 15:44 Sam James
2021-04-07  5:24 Sam James
2021-11-28 20:08 Mike Gilbert

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1440276072.d5da422b82e6f9078d263094d9d40c3e7f630aee.robbat2@gentoo \
    --to=robbat2@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox