[gentoo-commits] repo/gentoo:master commit in: sys-power/powertop/, sys-power/powertop/files/
commit: 9b2a5e5d3b05a54a75c05e5954c0aba866e83310
Author: Matt Turner gentoo org>
AuthorDate: Mon Jan 24 05:53:35 2022 +
Commit: Matt Turner gentoo org>
CommitDate: Mon Jan 24 05:55:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b2a5e5d
sys-power/powertop: Drop old versions
Signed-off-by: Matt Turner gentoo.org>
sys-power/powertop/Manifest| 1 -
...onfigure.ac-Use-PKG_PROG_PKG_CONFIG-macro.patch | 62 ---
sys-power/powertop/powertop-2.13-r2.ebuild | 120 -
3 files changed, 183 deletions(-)
diff --git a/sys-power/powertop/Manifest b/sys-power/powertop/Manifest
index 7509e164f2d7..48905cdeb4b4 100644
--- a/sys-power/powertop/Manifest
+++ b/sys-power/powertop/Manifest
@@ -1,2 +1 @@
-DIST powertop-2.13.tar.gz 303030 BLAKE2B
3c88e05f9889cc4b276bea3bc50a3a83228ca8efae278379a14fadc6104754f2837174e028bf9c5ded9f3af84ce6b8766ac3d24b6ae62b9b192c03fc3afdec11
SHA512
8ebeccd17b6f76d9e445382d9ce5b1c00ab2daf4f1e6e133c249bceb35ea582ca3e76da5415fd0b55a28b8a124655dc5ac7a18aaf2a3df955547d77495e59181
DIST powertop-2.14.tar.gz 302578 BLAKE2B
5f53f81b01e83004f6436f497818d2a552b5e7ffda5007749aad415773adeab2a256aeffbacbf9e5fe803ff343a0c1954b5264aebdffa841bb70406b8b9611bc
SHA512
f3e25901fb29405e0c8016643855a209cf9dba589fe9dd3e27c291d44699cebeb00dc8c7264c24436db08deb496759bd10cb52d9ebd5f831bbb99e30f20f
diff --git
a/sys-power/powertop/files/0001-configure.ac-Use-PKG_PROG_PKG_CONFIG-macro.patch
b/sys-power/powertop/files/0001-configure.ac-Use-PKG_PROG_PKG_CONFIG-macro.patch
deleted file mode 100644
index c864020514e1..
---
a/sys-power/powertop/files/0001-configure.ac-Use-PKG_PROG_PKG_CONFIG-macro.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 311b88d2a078aa68b042dc37b416a9bdb3f650e5 Mon Sep 17 00:00:00 2001
-From: Ed Baker
-Date: Thu, 3 Sep 2020 09:01:25 -0700
-Subject: [PATCH] configure.ac: Use PKG_PROG_PKG_CONFIG macro
-
-The goal of this commit is to fix an error encountered when building
-2.13 on Chromium OS.
-emerge-${board} powertop
-
- checking for libnl-3.0 >= 3.0 libnl-genl-3.0 >= 3.0... yes
- checking for library containing inet_aton... none required
- * pkg-config: ERROR: Do not call unprefixed tools directly.
- * pkg-config: ERROR: For board tools, use `tc-export PKG_CONFIG` (or
${CHOST}-pkg-config).
- * pkg-config: ERROR: For build-time-only tools, `tc-export
BUILD_PKG_CONFIG` (or ${CBUILD}-pkg-config).
- * python3 /mnt/data/chromiumos/chromite/bin/cros_sdk --enter
--chrome_root=chrome_root
- * `-python3 /mnt/data/chromiumos/chromite/bin/cros_sdk --enter
--chrome_root=chrome_root
- * `-bash
- * `-emerge -b /usr/lib/python-exec/python3.6/emerge --root-deps
powertop
- * `-sandbox /usr/lib/portage/python3.6/ebuild.sh configure
- * `-ebuild.sh /usr/lib/portage/python3.6/ebuild.sh
configure
- * `-ebuild.sh /usr/lib/portage/python3.6/ebuild.sh
configure
- * `-configure ./configure --prefix=/usr
--build=x86_64-pc-linux-gnu --host=x86_64-cros-linux-gnu
--mandir=/usr/share/man --infodir=/usr/share/info --datadir=/usr/share
--sysconfdir=/etc --localstatedir=/var/lib --disable-dependency-tracking
--disable-silent-rules --docdir=/usr/share/doc/powertop-2.13
--htmldir=/usr/share/doc/powertop-2.13/html --with-sysroot=/build/volteer
--libdir=/usr/lib64 --disable-nls
- * `-pkg-config
/build/volteer/tmp/portage/sys-power/powertop-2.13/temp/build-toolchain-wrappers/pkg-config
--exists bash-completion
- * `-pstree -a -A -s -l 10567
- * ERROR: sys-power/powertop-2.13::portage-stable failed (configure phase):
- * Bad pkg-config [--exists bash-completion] invocation
-
-
-The environment variable is populated for board specific tooling.
-declare -x PKG_CONFIG="/build/volteer/build/bin/pkg-config"
-
-Signed-off-by: Ed Baker
- configure.ac | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 8daa48d..f191197 100644
a/configure.ac
-+++ b/configure.ac
-@@ -38,6 +38,7 @@ AC_PROG_INSTALL
- AM_PROG_CC_C_O
- AX_ADD_FORTIFY_SOURCE
- AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory])
-+PKG_PROG_PKG_CONFIG
-
- # Checks for libraries.
- AX_PTHREAD([
-@@ -155,8 +156,8 @@ AC_SEARCH_LIBS([inet_aton], [resolv], [], [
- ], [])
-
-
--AS_IF([`pkg-config --exists bash-completion`], [
-- bashcompletiondir=`pkg-config --variable=completionsdir
--define-variable=prefix=${prefix} bash-completion`
-+AS_IF([`${PKG_CONFIG} --exists bash-completion`], [
-+ bashcompletiondir=`${PKG_CONFIG} --variable=completionsdir
--define-variable=prefix=${prefix} bash-completion`
- ], [
- bashcompletiondir=${datadir}/bash-completion/completions
- ])
---
-2.17.1
-
diff --git a/sys-power/powertop/powertop-2.13-r2.ebuild
b/sys-power/powertop/power
[gentoo-commits] repo/gentoo:master commit in: sys-power/powertop/, sys-power/powertop/files/
commit: b58dab88294efd16e05c66a751d606235b103dbf
Author: Zentaro Kavanagh chromium org>
AuthorDate: Thu Jun 14 20:40:54 2018 +
Commit: Mike Frysinger gentoo org>
CommitDate: Mon Jun 18 14:54:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b58dab88
sys-power/powertop: Support ncurses with tinfo
- Patches the configure.ac to fix bug getting libs from pkg-config
- Previous code matched only when both ncursesw and ncurses existed
- Used wrong variable when concatenating to LIBS
- Concatenating to LIBS was redundant anyway since it is done in
makefile.am
- Upstream patch sent to powertop mailing list [1]
Url: https://lists.01.org/pipermail/powertop/2018-June/002021.html [1]
.../files/powertop-2.8-ncurses_tinfo.patch | 41 ++
sys-power/powertop/powertop-2.8.ebuild | 11 +++---
sys-power/powertop/powertop-2.9.ebuild | 8 +++--
3 files changed, 52 insertions(+), 8 deletions(-)
diff --git a/sys-power/powertop/files/powertop-2.8-ncurses_tinfo.patch
b/sys-power/powertop/files/powertop-2.8-ncurses_tinfo.patch
new file mode 100644
index 000..97769fb6728
--- /dev/null
+++ b/sys-power/powertop/files/powertop-2.8-ncurses_tinfo.patch
@@ -0,0 +1,41 @@
+From e1295099f8b42670718ba875cb6749a90042293f Mon Sep 17 00:00:00 2001
+From: Zentaro Kavanagh
+Date: Thu, 14 Jun 2018 13:13:37 -0700
+Subject: [PATCH] Fix configure to support ncurses w/ tinfo
+
+- The existing code checked for both ncursesw and ncurses and if
+ both were not found, NCURSES_LIBS was not set correctly.
+- Removed redundant concatenation to $LIBS since the makefile.am
+ already maps NCURSES_LIBS into LIBS.
+- Patch sent upstream to powertop mailing list [1]
+
+[1] - https://lists.01.org/pipermail/powertop/2018-June/002021.html
+---
+ configure.ac | 11 +++
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index d6a15e1..c6ee50a 100644
+--- a/configure.ac
b/configure.ac
+@@ -110,10 +110,13 @@ AC_CHECK_FUNCS([ \
+
+ AC_SEARCH_LIBS([clock_gettime], [rt])
+
+-PKG_CHECK_MODULES([NCURSES], [ncursesw ncurses], [LIBS="$LIBS
$ncurses_LIBS"], [
+- AC_SEARCH_LIBS([delwin], [ncursesw ncurses], [], [
+- AC_MSG_ERROR([ncurses is required but was not found])
+- ], [])
++PKG_CHECK_MODULES([ncursesw], [ncursesw],
++ [NCURSES_CFLAGS="$ncursesw_CFLAGS"; NCURSES_LIBS="$ncursesw_LIBS"], [
++ PKG_CHECK_MODULES([NCURSES], [ncurses], [], [
++ AC_SEARCH_LIBS([delwin], [ncursesw ncurses], [], [
++ AC_MSG_ERROR([ncurses is required but was not found])
++ ])
++ ])
+ ])
+
+ has_libpci=0
+--
+2.18.0.rc1.242.g61856ae69a-goog
+
diff --git a/sys-power/powertop/powertop-2.8.ebuild
b/sys-power/powertop/powertop-2.8.ebuild
index e0975e47ca8..2ec905b8419 100644
--- a/sys-power/powertop/powertop-2.8.ebuild
+++ b/sys-power/powertop/powertop-2.8.ebuild
@@ -3,7 +3,7 @@
EAPI="5"
-inherit eutils linux-info
+inherit eutils linux-info autotools
SRC_URI="https://01.org/sites/default/files/downloads/${PN}/${P}.tar.gz";
KEYWORDS="amd64 arm ppc sparc x86 ~amd64-linux ~x86-linux"
@@ -91,11 +91,10 @@ pkg_setup() {
}
src_prepare() {
- if [[ ${PV} == "" ]] ; then
- eautoreconf
- else
- default
- fi
+ epatch "${FILESDIR}"/${P}-ncurses_tinfo.patch
+
+ # Call eautoreconf since ncurses patch touches configure.ac.
+ eautoreconf
}
src_configure() {
diff --git a/sys-power/powertop/powertop-2.9.ebuild
b/sys-power/powertop/powertop-2.9.ebuild
index cf837648689..d9536ebd1e0 100644
--- a/sys-power/powertop/powertop-2.9.ebuild
+++ b/sys-power/powertop/powertop-2.9.ebuild
@@ -3,7 +3,7 @@
EAPI="6"
-inherit eutils linux-info
+inherit eutils linux-info autotools
if [[ ${PV} == "" ]] ; then
EGIT_REPO_URI="https://github.com/fenrus75/powertop.git";
inherit git-r3 autotools
@@ -40,6 +40,7 @@ RDEPEND="
PATCHES=(
"${FILESDIR}"/${P}-libc++.patch
+ "${FILESDIR}"/${PN}-2.8-ncurses_tinfo.patch
)
pkg_setup() {
@@ -105,8 +106,11 @@ src_prepare() {
if [[ ${PV} == "" ]] ; then
chmod +x scripts/version || die "Failed to make
'scripts/version' executable"
scripts/version || die "Failed to extract version information"
- eautoreconf
fi
+
+ # Call eautoreconf since ncurses patch touches configure.ac.
+ $(which aclocal) --install -Im4 2>/dev/null #599114
+ eautoreconf
}
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: sys-power/powertop/, sys-power/powertop/files/
commit: 56d45d2e211908e6a4055c67d798c2a90395e77d
Author: Mike Frysinger chromium org>
AuthorDate: Wed Jan 24 23:34:54 2018 +
Commit: Mike Frysinger gentoo org>
CommitDate: Wed Jan 24 23:34:54 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56d45d2e
sys-power/powertop: version bump to 2.9 #637342
sys-power/powertop/Manifest| 1 +
sys-power/powertop/files/powertop-2.9-libc++.patch | 44 ++
.../{powertop-.ebuild => powertop-2.9.ebuild} | 10 -
sys-power/powertop/powertop-.ebuild| 6 ++-
4 files changed, 57 insertions(+), 4 deletions(-)
diff --git a/sys-power/powertop/Manifest b/sys-power/powertop/Manifest
index 25ec6b5378f..c0cd2b6155f 100644
--- a/sys-power/powertop/Manifest
+++ b/sys-power/powertop/Manifest
@@ -1 +1,2 @@
DIST powertop-2.8.tar.gz 67 BLAKE2B
4259f462d36fe0cbb157859d6e1d3e1face67f7232fe8d4112d77f844b545f49e9cf486e21bcbc34f64ffb0c891c1864141784dde14e3a96647d6535641a840a
SHA512
253d0e15f0972cf8639735c510f4884d49a0da76c31dd2f39603e2297e6c6f0b9fa283c7b3cb04a431c91f8296275c0adaecc4c3e9ea132c0c31064f7f432c80
+DIST powertop-v2.9.tar.gz 718763 BLAKE2B
bb6ce789614397b02f0e9f1cb71585cb456c1428cc43e9fe1c4b3bc9f96171fede4c587410e78e58ad8d0b0f772549a93f454bcd1b521e6dd3c809a85dc3cf30
SHA512
783af538c44e3fae7215a5b4247eb32a72e02150b3f297e6b9777a450823dd30aca014601892c0e80937a366eed95b42b622c68161d53e905ad4fbcb574b26f5
diff --git a/sys-power/powertop/files/powertop-2.9-libc++.patch
b/sys-power/powertop/files/powertop-2.9-libc++.patch
new file mode 100644
index 000..d378280f3c6
--- /dev/null
+++ b/sys-power/powertop/files/powertop-2.9-libc++.patch
@@ -0,0 +1,44 @@
+https://github.com/fenrus75/powertop/commit/b9c431aad6cc5383c9571007469eee8e64ec85a6
+
+From b9c431aad6cc5383c9571007469eee8e64ec85a6 Mon Sep 17 00:00:00 2001
+From: Manoj Gupta
+Date: Sat, 4 Nov 2017 13:44:04 -0700
+Subject: [PATCH] Fix powertop build with libc++.
+
+ header is not automatically included with libc++.
+Add it explicitly to make powertop build with libc++.
+
+This fixes the following errors:
+devices/gpu_rapl_device.cpp:35:14: error: use of undeclared identifier
+'time'; did you mean 'tie'?
+last_time = time(NULL);
+^~~~
+devices/gpu_rapl_device.cpp:45:14: error:use of undeclared identifier
+'time'; did you mean 'tie'?
+last_time = time(NULL);
+^~~~
+
+parameters/learn.cpp:161:10: error: use of undeclared identifier
+'time'; did you mean 'tie'?
+start =time(NULL);
+^~~~
+---
+ src/lib.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib.h b/src/lib.h
+index b64bb0f5433f..6d85eb6e4b40 100644
+--- a/src/lib.h
b/src/lib.h
+@@ -54,7 +54,7 @@ extern const char *kernel_function(uint64_t address);
+
+
+
+-
++#include
+ #include
+ using namespace std;
+
+--
+2.15.1
+
diff --git a/sys-power/powertop/powertop-.ebuild
b/sys-power/powertop/powertop-2.9.ebuild
similarity index 94%
copy from sys-power/powertop/powertop-.ebuild
copy to sys-power/powertop/powertop-2.9.ebuild
index 923a9055543..a46c1a302cb 100644
--- a/sys-power/powertop/powertop-.ebuild
+++ b/sys-power/powertop/powertop-2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -9,8 +9,10 @@ if [[ ${PV} == "" ]] ; then
inherit git-r3 autotools
SRC_URI=""
else
- SRC_URI="https://01.org/sites/default/files/downloads/${PN}/${P}.tar.gz";
+ MY_P="${PN}-v${PV}"
+
SRC_URI="https://01.org/sites/default/files/downloads/${PN}/${MY_P}.tar.gz";
KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+ S="${WORKDIR}/${MY_P}"
fi
DESCRIPTION="tool that helps you find what software is using the most power"
@@ -36,6 +38,10 @@ RDEPEND="
virtual/libintl
"
+PATCHES=(
+ "${FILESDIR}"/${P}-libc++.patch
+)
+
pkg_setup() {
CONFIG_CHECK="
~X86_MSR
diff --git a/sys-power/powertop/powertop-.ebuild
b/sys-power/powertop/powertop-.ebuild
index 923a9055543..62872e31be8 100644
--- a/sys-power/powertop/powertop-.ebuild
+++ b/sys-power/powertop/powertop-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -9,8 +9,10 @@ if [[ ${PV} == "" ]] ; then
inherit git-r3 autotools
SRC_URI=""
else
- SRC_URI="https://01.org/sites/default/files/downloads/${PN}/${P}.tar.gz";
+ MY_P="${PN}-v${PV}"
+
SRC_URI="https://01.org/sites/default/files/downloads/${PN}/${MY_P}.tar.gz";
KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+ S="${WORKDIR}/${MY_P}"
fi
DESCRIPTION="tool that helps you find what software is using the most power"
