diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2013-03-08 06:16:03 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2013-03-08 06:16:03 +0000 |
| commit | 140b0b82499e5aea18fc87257e69d8ae985fb60b (patch) | |
| tree | 25f2925218047a819ee4e6e380f78aaf6d24e140 /sys-power | |
| parent | Stable on amd64, wrt bug #460704 (diff) | |
| download | gentoo-2-140b0b82499e5aea18fc87257e69d8ae985fb60b.tar.gz gentoo-2-140b0b82499e5aea18fc87257e69d8ae985fb60b.tar.bz2 gentoo-2-140b0b82499e5aea18fc87257e69d8ae985fb60b.zip | |
Fix cross-compiling. Again.
(Portage version: 2.2.0_alpha164/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
Diffstat (limited to 'sys-power')
| -rw-r--r-- | sys-power/powertop/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-power/powertop/powertop-2.2-r1.ebuild | 13 | ||||
| -rw-r--r-- | sys-power/powertop/powertop-9999.ebuild | 15 |
3 files changed, 24 insertions, 12 deletions
diff --git a/sys-power/powertop/ChangeLog b/sys-power/powertop/ChangeLog index 3edfdedf44ae..a8d7576af7bc 100644 --- a/sys-power/powertop/ChangeLog +++ b/sys-power/powertop/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-power/powertop -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/ChangeLog,v 1.74 2012/12/09 20:48:24 zerochaos Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/ChangeLog,v 1.75 2013/03/08 06:16:03 vapier Exp $ + + 08 Mar 2013; Mike Frysinger <vapier@gentoo.org> powertop-2.2-r1.ebuild, + powertop-9999.ebuild: + Fix cross-compiling. Again. 09 Dec 2012; Rick Farina <zerochaos@gentoo.org> -powertop-1.11.ebuild, -powertop-2.0.ebuild, -powertop-2.1-r1.ebuild, -powertop-2.1.ebuild, diff --git a/sys-power/powertop/powertop-2.2-r1.ebuild b/sys-power/powertop/powertop-2.2-r1.ebuild index 9443d3c3fcbd..8b81f3396c76 100644 --- a/sys-power/powertop/powertop-2.2-r1.ebuild +++ b/sys-power/powertop/powertop-2.2-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-2.2-r1.ebuild,v 1.2 2012/12/09 20:48:24 zerochaos Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-2.2-r1.ebuild,v 1.3 2013/03/08 06:16:03 vapier Exp $ EAPI="5" inherit eutils linux-info -if [ ${PV} == "9999" ] ; then +if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="git://github.com/fenrus75/powertop.git" inherit git-2 autotools SRC_URI="" @@ -85,7 +85,7 @@ pkg_setup() { src_prepare() { epatch "${FILESDIR}"/${P}-use-package_version.patch - if [ ${PV} == "9999" ] ; then + if [[ ${PV} == "9999" ]] ; then eautoreconf fi } @@ -96,8 +96,9 @@ src_configure() { } src_compile() { - #the clean is needed because the 2.1 tarball had object files in src/tuning/ - emake clean + # This fixes cross-compiling. Please verify before deleting. + emake -C src csstoh + cp "${FILESDIR}"/csstoh src/ || die emake } diff --git a/sys-power/powertop/powertop-9999.ebuild b/sys-power/powertop/powertop-9999.ebuild index ba7570238b3e..b1efc316eb65 100644 --- a/sys-power/powertop/powertop-9999.ebuild +++ b/sys-power/powertop/powertop-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-9999.ebuild,v 1.16 2012/11/22 15:00:37 zerochaos Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-9999.ebuild,v 1.17 2013/03/08 06:16:03 vapier Exp $ EAPI="4" inherit eutils linux-info -if [ ${PV} == "9999" ] ; then +if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="git://github.com/fenrus75/powertop.git" inherit git-2 autotools SRC_URI="" @@ -83,7 +83,7 @@ pkg_setup() { } src_prepare() { - if [ ${PV} == "9999" ] ; then + if [[ ${PV} == "9999" ]] ; then eautoreconf fi } @@ -93,6 +93,13 @@ src_configure() { default } +src_compile() { + # This fixes cross-compiling. Please verify before deleting. + emake -C src csstoh + cp "${FILESDIR}"/csstoh src/ || die + emake +} + src_install() { default keepdir /var/cache/powertop |