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
commit5bdf16f10b0b5c6fdc8e4582008426d78b30fe23 (patch)
tree2b45a64ffdbf39d13bc72f955e17cf0d912fc54d /sys-power
parentRespect $PKG_CONFIG, and fix linking with gthread. (diff)
downloadhistorical-5bdf16f10b0b5c6fdc8e4582008426d78b30fe23.tar.gz
historical-5bdf16f10b0b5c6fdc8e4582008426d78b30fe23.tar.bz2
historical-5bdf16f10b0b5c6fdc8e4582008426d78b30fe23.zip
Fix cross-compiling; already sent upstream.
Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64
Diffstat (limited to 'sys-power')
-rw-r--r--sys-power/powertop/ChangeLog6
-rw-r--r--sys-power/powertop/Manifest31
-rw-r--r--sys-power/powertop/files/csstoh18
-rw-r--r--sys-power/powertop/powertop-2.0.ebuild8
4 files changed, 46 insertions, 17 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/Manifest b/sys-power/powertop/Manifest
index c4de0a7b8d6b..13227245ca38 100644
--- a/sys-power/powertop/Manifest
+++ b/sys-power/powertop/Manifest
@@ -1,6 +1,7 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
+AUX csstoh 198 RMD160 b09d8c475c635869b506a22e0d2c7be9ff5c6d2a SHA1 682313691b73eb8567cfee3d5c513c974ee1d65b SHA256 03e4300bd73e0b8da29546e79f2c94be90626c545d88c84c2c95dd04b2d94035
AUX powertop-1.98-build-cc.patch 704 RMD160 487e240229d57fabf82dc6c1979123fc3055f6b9 SHA1 55a3fe982b5e24e208ce137d143a39929fb36532 SHA256 36ccfeec0c64f0131415238316e14fee2239d4af0a52b48c0162181f49ad9457
AUX powertop-1.98-build-libnl-3.patch 611 RMD160 351d9db264b89a2976d209a2759055b14fa90296 SHA1 ccfa0bf775208e17b9b6577b1f5393f166e5be6b SHA256 0799362cdf6923a1a8a0c9ac61097dbaa6ffa21d5b0dd038bae44f58102e4328
AUX powertop-1.98-build.patch 2266 RMD160 b8be82c9f2763e0a566768bf0a99cee65209ca55 SHA1 3bc5880bcf2994fac6b37a7c490ee5b50120ee79 SHA256 8b76948494deb0bece80e7300ec8f84c2fab7bf1d79838faa3e52478142ebfeb
@@ -10,24 +11,24 @@ DIST powertop-1.13.tar.gz 104675 RMD160 e6cf649e387a9a6f8cf036ddfa0f5def50303f76
DIST powertop-2.0.tar.bz2 456654 RMD160 d2c657fac6b1c0b430099d60fe8ee80e3d379e57 SHA1 ec64a472a4e1539d6dfc9725f6d934e908d5930c SHA256 7af51d320856b3446bcc314c9414385f3b05b9360f650883b0210cd3b12c5c1c
EBUILD powertop-1.11.ebuild 1103 RMD160 352796f0e4974260fe498de282270cb388e211bc SHA1 137f2c60671829387c573203f9813a6f33f50e2a SHA256 5c961061f2e057b2258f55323c0d618006abf9039816d3811064ca0f6fa84911
EBUILD powertop-1.13.ebuild 1121 RMD160 6e9e4a84aaf6b643a4cd83f28516b0e51d36d5e9 SHA1 84deca5fe572d0820751741fb8c5bf8c114e33b4 SHA256 ad10c47049432ef0f9047eee7c5c6db033843f699cd2003c5b087169a296a030
-EBUILD powertop-2.0.ebuild 1194 RMD160 51a5cf5e91860117894111d246ca48086565a3c2 SHA1 07738b534f4ea78a4f15b1f610f1368ca26d3d68 SHA256 3eb55e070cc67b805361fab920c1df916da41056fcd2379e6223378e76b6501f
+EBUILD powertop-2.0.ebuild 1278 RMD160 7024466d035219c75cc73732f66817865357bee6 SHA1 84069ba5cd09fe2b34e560806f3327b310b498ae SHA256 46171dac92d90ecb75b62103168b0ddc912e27afb53fb701bdb003d2126971e6
EBUILD powertop-9999.ebuild 1196 RMD160 9b4234be587bd9957c65a310e67f8f094047eccf SHA1 4cfe4e735d2bf4ab5b3df31c02efc0ed7377e10b SHA256 0fb0a70b93f3098caf350a4f9af1c82dcdb711e1fb9c1d1523a3c47910b9e1eb
-MISC ChangeLog 7652 RMD160 03498af7d2222116c417f8eba912cb698c58e4f8 SHA1 a0fa565ff780bfc30f6fcf384d5f333790c92c3d SHA256 6f51b117a4c0242ee12d9334e28c201e4465570033f1c3a7622a82f8f96ed066
+MISC ChangeLog 7787 RMD160 35083df326415721cbf6bc13cecd8d977150a1d4 SHA1 509b3e2d5a2a7867e5b890d866aca734838e1ae6 SHA256 880aeda45770f0cd7da20b4d76a5f5a97580328bc40cecfd245ae358454b6ec8
MISC metadata.xml 161 RMD160 a5e1f234c4886ff31d39f229a0cf30d0bfcea869 SHA1 3876fd42cd9e63a7edb04c5025d53d773aa80bc3 SHA256 838bd208a7f948ea9b4e2b8869464622bc64a2f02468de4c3d7f6c2530e28e89
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQIcBAEBAgAGBQJPyP7xAAoJELEHsLL7fEFW3jgP/07gM3vu+t6tjIvauARQUZQB
-3C7izg6E7Ivhf16iqQkYEFeLeyRipPSRSEy9ggzjuXYcL2htXNFiLYd4l1SfukvH
-faoyAho9WKOfY1O7QOkyXjxhfg9shqATipTRkBs5dP/OoAwJzDuiL5WkO5RsnU3E
-Fb3yGQ2Ddla2QJTiJ/UfCor+GCs5K37xoWzcnKypRWDqIMvHbTWQJzh9W2WbLAWw
-hDeYhdeEt8T/S7AbLpodSpVQUEs0qzJRDqkqsmRCt3n5VebPFEkkl6qzQqCV9H3I
-DZ0YKvZIJuK1BYoDQwn6Lqgm0n/tLG9pdePS1lFQrbfOJyvPhJpyQAI+ks8PTqBf
-Q9QaqHSK6V0FTENeySQ5J0yWYK0hzn4xRzi1VWT2G3kCWOKFddH3ASuHh7ajMXVl
-UIzxCfvLOG2fGCh0O/Wps6ze0bxBXFdUI0NPTpgKKwGNVMqoF0mM5tRPThxDuFR1
-tPVtaJYWGSJALz59iWuN7ZwEUB6gs5QT8Gw34y3suAVAf2+xmaX+aEZ8RmyL/93Q
-dkwVDng63LK5xVjiqOpQ4SbRggVEQoEhGWFw+UzE1LleN1rpOSm5Vj7ydzR22Yyk
-LpFUTzmc299wbXHPqndxNKYhOUTDjjvGRPNqovAnTOqqqctwetgFuTVMsShvz6HF
-OxetmgaYNvb8ZB0rdDtB
-=4kHK
+iQIcBAEBAgAGBQJPyQoPAAoJELEHsLL7fEFW57IP/260A8glVj/o2nEDWxWk6Ne+
+bbHkEKPhPzFvOssgemxi6v501W/BVeOyK3H2RZyzu3K4G/QAlTHvI25LpQ/q4Lzk
+nQHQFECuSwnJFGb4LDNGF3aw1dxm7wBALCkm9mkuoJdU1H3rBvFZlL7w9SshOCik
+Xl51rsAfr4bH+eCuljCnXTh1Gb6cVZcAfoF9wTj1HValzFtqe62Or0y+Ftom/iJJ
+pYn2Buz8o0JSN5xfolnnDk1YbYo+5fkmozEMLxozlj1UQL8avbhfj7JFXMHmvT9Y
+M/LGjVtV0Q+lRb2196/f2vX5xanLRyVKK9WnEzGp/AgjDAaY4RlcEuQYDGK203Gl
+gu+STmynlByxk2aXKrY4CKYJCEcUgX4mo0PYj28srsYSUYiHOaoKoz1Fn4K49IdX
+FgpU/8iQ5w0wXHySYHLQMcANXFYi8W787SRx4qBjWnBdLtFNHm5bbKZxO8QdTNkS
+642EcOjxRVCDsec95MR5bjbDckOteBIECQczEBNSg917dUUKXY+7iWTrrhblG3+V
+0xjRri8zzWuiFQoRKcJMYZCC/lQwkBRJIubd+JsLZDNBQL76Ki4dMryMk8YUU3L+
+CmRkkqrO2wfzcxuivV6iG8wm3AWecfCkIQPV/QqGcmaskd4byucxew8H4jdkzE6s
+7rYpqa84/ikX+wdaqIL0
+=xlnz
-----END PGP SIGNATURE-----
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