summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-06-01 18:29:29 +0000
committerMike Frysinger <vapier@gentoo.org>2012-06-01 18:29:29 +0000
commit4cbb83e7d1ab1d8cae51aa8281e3884c7c5107c5 (patch)
tree49cda7f1e030cb419430bfaf9edf997ded48a3fa
parentRespect $PKG_CONFIG, and fix linking with gthread. (diff)
downloadgentoo-2-4cbb83e7d1ab1d8cae51aa8281e3884c7c5107c5.tar.gz
gentoo-2-4cbb83e7d1ab1d8cae51aa8281e3884c7c5107c5.tar.bz2
gentoo-2-4cbb83e7d1ab1d8cae51aa8281e3884c7c5107c5.zip
Fix cross-compiling; already sent upstream.
(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)
-rw-r--r--sys-power/powertop/ChangeLog6
-rw-r--r--sys-power/powertop/files/csstoh18
-rw-r--r--sys-power/powertop/powertop-2.0.ebuild8
3 files changed, 30 insertions, 2 deletions
diff --git a/sys-power/powertop/ChangeLog b/sys-power/powertop/ChangeLog
index b629a5f573ec..a3a21a544c49 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.52 2012/06/01 17:42:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/ChangeLog,v 1.53 2012/06/01 18:29:29 vapier Exp $
+
+ 01 Jun 2012; Mike Frysinger <vapier@gentoo.org> +files/csstoh,
+ powertop-2.0.ebuild:
+ Fix cross-compiling; already sent upstream.
01 Jun 2012; Mike Frysinger <vapier@gentoo.org> powertop-2.0.ebuild,
powertop-9999.ebuild:
diff --git a/sys-power/powertop/files/csstoh b/sys-power/powertop/files/csstoh
new file mode 100644
index 000000000000..51d1ec1372b0
--- /dev/null
+++ b/sys-power/powertop/files/csstoh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+in=$1
+out=$2
+
+(
+cat <<EOF
+#ifndef __INCLUDE_GUARD_CCS_H
+#define __INCLUDE_GUARD_CCS_H
+
+const char css[] =
+EOF
+sed -e 's:^:\t":' -e 's:$:\\n":' "${in}"
+cat <<EOF
+;
+#endif
+EOF
+) > "${out}"
diff --git a/sys-power/powertop/powertop-2.0.ebuild b/sys-power/powertop/powertop-2.0.ebuild
index 548bdb7cf093..d7fd1c905e2e 100644
--- a/sys-power/powertop/powertop-2.0.ebuild
+++ b/sys-power/powertop/powertop-2.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-2.0.ebuild,v 1.2 2012/06/01 17:42:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-2.0.ebuild,v 1.3 2012/06/01 18:29:29 vapier Exp $
EAPI="4"
@@ -40,6 +40,12 @@ src_configure() {
default
}
+src_compile() {
+ emake -C src csstoh
+ cp "${FILESDIR}"/csstoh src/ || die
+ emake
+}
+
src_install() {
default
keepdir /var/cache/powertop