* [gentoo-commits] repo/gentoo:master commit in: sys-power/powertop/files/, sys-power/powertop/
@ 2019-07-28 16:40 Matt Turner
0 siblings, 0 replies; 4+ messages in thread
From: Matt Turner @ 2019-07-28 16:40 UTC (permalink / raw
To: gentoo-commits
commit: c6efdbfc31406b5b076f5f6bc9532eeb5990576e
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 28 16:39:59 2019 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Jul 28 16:40:27 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6efdbfc
sys-power/powertop: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
sys-power/powertop/Manifest | 2 -
.../files/powertop-2.8-ncurses_tinfo.patch | 41 -------
sys-power/powertop/powertop-2.8.ebuild | 103 ------------------
sys-power/powertop/powertop-2.9.ebuild | 119 ---------------------
4 files changed, 265 deletions(-)
diff --git a/sys-power/powertop/Manifest b/sys-power/powertop/Manifest
index a75203dd1ab..b1fe3aade12 100644
--- a/sys-power/powertop/Manifest
+++ b/sys-power/powertop/Manifest
@@ -1,3 +1 @@
-DIST powertop-2.8.tar.gz 670000 BLAKE2B 4259f462d36fe0cbb157859d6e1d3e1face67f7232fe8d4112d77f844b545f49e9cf486e21bcbc34f64ffb0c891c1864141784dde14e3a96647d6535641a840a SHA512 253d0e15f0972cf8639735c510f4884d49a0da76c31dd2f39603e2297e6c6f0b9fa283c7b3cb04a431c91f8296275c0adaecc4c3e9ea132c0c31064f7f432c80
DIST powertop-v2.10.tar.gz 722992 BLAKE2B 573f1f0ed40705d3463f6e6f76c67ae99127ab2541b851143dafa707ef1c2dab4127d27811b63ad27e6b002ea4efd39417297a0227996ad9b01141b6de733d41 SHA512 4219e7aadbeebdf6932c04f784434e4dd0f540bf4941d43c1830b1b5cad1f3928769b13897e24dd956b6bdee65fb1fbe902ee30685bca229b71e140d65367837
-DIST powertop-v2.9.tar.gz 718763 BLAKE2B bb6ce789614397b02f0e9f1cb71585cb456c1428cc43e9fe1c4b3bc9f96171fede4c587410e78e58ad8d0b0f772549a93f454bcd1b521e6dd3c809a85dc3cf30 SHA512 783af538c44e3fae7215a5b4247eb32a72e02150b3f297e6b9777a450823dd30aca014601892c0e80937a366eed95b42b622c68161d53e905ad4fbcb574b26f5
diff --git a/sys-power/powertop/files/powertop-2.8-ncurses_tinfo.patch b/sys-power/powertop/files/powertop-2.8-ncurses_tinfo.patch
deleted file mode 100644
index 97769fb6728..00000000000
--- a/sys-power/powertop/files/powertop-2.8-ncurses_tinfo.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From e1295099f8b42670718ba875cb6749a90042293f Mon Sep 17 00:00:00 2001
-From: Zentaro Kavanagh <zentaro@chromium.org>
-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
deleted file mode 100644
index 2ec905b8419..00000000000
--- a/sys-power/powertop/powertop-2.8.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-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"
-
-DESCRIPTION="tool that helps you find what software is using the most power"
-HOMEPAGE="https://01.org/powertop/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls unicode X"
-
-COMMON_DEPEND="
- dev-libs/libnl:3
- sys-apps/pciutils
- sys-libs/ncurses:=[unicode?]
-"
-
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
- sys-devel/gettext
-"
-RDEPEND="
- ${COMMON_DEPEND}
- X? ( x11-apps/xset )
- virtual/libintl
-"
-
-DOCS=( TODO README )
-
-pkg_setup() {
- CONFIG_CHECK="
- ~X86_MSR
- ~DEBUG_FS
- ~PERF_EVENTS
- ~TRACEPOINTS
- ~NO_HZ_IDLE
- ~HIGH_RES_TIMERS
- ~HPET_TIMER
- ~CPU_FREQ_STAT
- ~CPU_FREQ_GOV_ONDEMAND
- ~FTRACE
- ~BLK_DEV_IO_TRACE
- ~TRACING
- "
- ERROR_KERNEL_X86_MSR="X86_MSR is not enabled in the kernel, you almost certainly need it"
- ERROR_KERNEL_DEBUG_FS="DEBUG_FS is not enabled in the kernel, you almost certainly need it"
- ERROR_KERNEL_PERF_EVENTS="PERF_EVENTS should be enabled in the kernel for full powertop function"
- ERROR_KERNEL_TRACEPOINTS="TRACEPOINTS should be enabled in the kernel for full powertop function"
- ERROR_KERNEL_NO_HZ_IDLE="NO_HZ_IDLE should be enabled in the kernel for full powertop function"
- ERROR_KERNEL_HIGH_RES_TIMERS="HIGH_RES_TIMERS should be enabled in the kernel for full powertop function"
- ERROR_KERNEL_HPET_TIMER="HPET_TIMER should be enabled in the kernel for full powertop function"
- ERROR_KERNEL_CPU_FREQ_STAT="CPU_FREQ_STAT should be enabled in the kernel for full powertop function"
- ERROR_KERNEL_CPU_FREQ_GOV_ONDEMAND="CPU_FREQ_GOV_ONDEMAND should be enabled in the kernel for full powertop function"
- ERROR_KERNEL_FTRACE="FTRACE needs to be turned on to enable BLK_DEV_IO_TRACE"
- ERROR_KERNEL_BLK_DEV_IO_TRACE="BLK_DEV_IO_TRACE needs to be turned on to enable other config options"
- ERROR_KERNEL_TRACING="TRACING should be enabled in the kernel for full powertop function"
- linux-info_pkg_setup
- if linux_config_exists; then
- if kernel_is -lt 3 7 0; then
- if linux_chkconfig_present SND_HDA_INTEL; then
- CONFIG_CHECK="~SND_HDA_POWER_SAVE"
- ERROR_KERNEL_SND_HDA_POWER_SAVE="SND_HDA_POWER_SAVE should be enabled in the kernel for full powertop function"
- check_extra_config
- fi
- fi
- if kernel_is -lt 3 9 0; then
- CONFIG_CHECK="~EVENT_POWER_TRACING_DEPRECATED"
- ERROR_KERNEL_EVENT_POWER_TRACING_DEPRECATED="EVENT_POWER_TRACING_DEPRECATED should be enabled in the kernel for full powertop function"
- check_extra_config
- fi
- if kernel_is -lt 3 19; then
- CONFIG_CHECK="~PM_RUNTIME"
- ERROR_KERNEL_PM_RUNTIME="PM_RUNTIME should be enabled in the kernel for full powertop function"
- check_extra_config
- else
- CONFIG_CHECK="~PM"
- ERROR_KERNEL_PM="PM should be enabled in the kernel for full powertop function"
- check_extra_config
- fi
- if kernel_is -lt 4 11; then
- CONFIG_CHECK="~TIMER_STATS"
- ERROR_KERNEL_TIMER_STATS="TIMER_STATS should be enabled in the kernel for full powertop function"
- check_extra_config
- fi
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-ncurses_tinfo.patch
-
- # Call eautoreconf since ncurses patch touches configure.ac.
- eautoreconf
-}
-
-src_configure() {
- export ac_cv_search_delwin=$(usex unicode -lncursesw -lncurses)
- econf $(use_enable nls)
-}
diff --git a/sys-power/powertop/powertop-2.9.ebuild b/sys-power/powertop/powertop-2.9.ebuild
deleted file mode 100644
index d9536ebd1e0..00000000000
--- a/sys-power/powertop/powertop-2.9.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils linux-info autotools
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/fenrus75/powertop.git"
- inherit git-r3 autotools
- SRC_URI=""
-else
- MY_P="${PN}-v${PV}"
- SRC_URI="https://01.org/sites/default/files/downloads/${PN}/${MY_P}.tar.gz"
- KEYWORDS="amd64 arm ~arm64 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"
-HOMEPAGE="https://01.org/powertop/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls unicode X"
-
-COMMON_DEPEND="
- dev-libs/libnl:3
- sys-apps/pciutils
- sys-libs/ncurses:=[unicode?]
-"
-
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
- sys-devel/gettext
-"
-RDEPEND="
- ${COMMON_DEPEND}
- X? ( x11-apps/xset )
- virtual/libintl
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-libc++.patch
- "${FILESDIR}"/${PN}-2.8-ncurses_tinfo.patch
-)
-
-pkg_setup() {
- CONFIG_CHECK="
- ~X86_MSR
- ~DEBUG_FS
- ~PERF_EVENTS
- ~TRACEPOINTS
- ~NO_HZ_IDLE
- ~HIGH_RES_TIMERS
- ~HPET_TIMER
- ~CPU_FREQ_STAT
- ~CPU_FREQ_GOV_ONDEMAND
- ~FTRACE
- ~BLK_DEV_IO_TRACE
- ~TRACING
- "
- ERROR_KERNEL_X86_MSR="X86_MSR is not enabled in the kernel, you almost certainly need it"
- ERROR_KERNEL_DEBUG_FS="DEBUG_FS is not enabled in the kernel, you almost certainly need it"
- ERROR_KERNEL_PERF_EVENTS="PERF_EVENTS should be enabled in the kernel for full powertop function"
- ERROR_KERNEL_TRACEPOINTS="TRACEPOINTS should be enabled in the kernel for full powertop function"
- ERROR_KERNEL_NO_HZ_IDLE="NO_HZ_IDLE should be enabled in the kernel for full powertop function"
- ERROR_KERNEL_HIGH_RES_TIMERS="HIGH_RES_TIMERS should be enabled in the kernel for full powertop function"
- ERROR_KERNEL_HPET_TIMER="HPET_TIMER should be enabled in the kernel for full powertop function"
- ERROR_KERNEL_CPU_FREQ_STAT="CPU_FREQ_STAT should be enabled in the kernel for full powertop function"
- ERROR_KERNEL_CPU_FREQ_GOV_ONDEMAND="CPU_FREQ_GOV_ONDEMAND should be enabled in the kernel for full powertop function"
- ERROR_KERNEL_FTRACE="FTRACE needs to be turned on to enable BLK_DEV_IO_TRACE"
- ERROR_KERNEL_BLK_DEV_IO_TRACE="BLK_DEV_IO_TRACE needs to be turned on to enable other config options"
- ERROR_KERNEL_TRACING="TRACING should be enabled in the kernel for full powertop function"
- linux-info_pkg_setup
- if linux_config_exists; then
- if kernel_is -lt 3 7 0; then
- if linux_chkconfig_present SND_HDA_INTEL; then
- CONFIG_CHECK="~SND_HDA_POWER_SAVE"
- ERROR_KERNEL_SND_HDA_POWER_SAVE="SND_HDA_POWER_SAVE should be enabled in the kernel for full powertop function"
- check_extra_config
- fi
- fi
- if kernel_is -lt 3 9 0; then
- CONFIG_CHECK="~EVENT_POWER_TRACING_DEPRECATED"
- ERROR_KERNEL_EVENT_POWER_TRACING_DEPRECATED="EVENT_POWER_TRACING_DEPRECATED should be enabled in the kernel for full powertop function"
- check_extra_config
- fi
- if kernel_is -lt 3 19; then
- CONFIG_CHECK="~PM_RUNTIME"
- ERROR_KERNEL_PM_RUNTIME="PM_RUNTIME should be enabled in the kernel for full powertop function"
- check_extra_config
- else
- CONFIG_CHECK="~PM"
- ERROR_KERNEL_PM="PM should be enabled in the kernel for full powertop function"
- check_extra_config
- fi
- if kernel_is -lt 4 11; then
- CONFIG_CHECK="~TIMER_STATS"
- ERROR_KERNEL_TIMER_STATS="TIMER_STATS should be enabled in the kernel for full powertop function"
- check_extra_config
- fi
- fi
-}
-
-src_prepare() {
- default
- if [[ ${PV} == "9999" ]] ; then
- chmod +x scripts/version || die "Failed to make 'scripts/version' executable"
- scripts/version || die "Failed to extract version information"
- fi
-
- # Call eautoreconf since ncurses patch touches configure.ac.
- $(which aclocal) --install -Im4 2>/dev/null #599114
- eautoreconf
-}
-
-src_configure() {
- export ac_cv_search_delwin=$(usex unicode -lncursesw -lncurses)
- econf $(use_enable nls)
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/powertop/files/, sys-power/powertop/
@ 2020-09-24 17:05 Matt Turner
0 siblings, 0 replies; 4+ messages in thread
From: Matt Turner @ 2020-09-24 17:05 UTC (permalink / raw
To: gentoo-commits
commit: 9c10cffe157f1251b5b9936e10d887a35a416647
Author: Ed Baker <edward.baker <AT> intel <DOT> com>
AuthorDate: Thu Sep 3 16:37:12 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Sep 24 17:05:08 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c10cffe
powertop: Patch pkg-config calls
Originally submitted as pull request at
https://github.com/fenrus75/powertop/pull/68.
Signed-off-by: Ed Baker <edward.baker <AT> intel.com>
Closes: https://github.com/gentoo/gentoo/pull/17579
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
...onfigure.ac-Use-PKG_PROG_PKG_CONFIG-macro.patch | 62 ++++++++++++++++++++++
...owertop-2.13.ebuild => powertop-2.13-r1.ebuild} | 1 +
2 files changed, 63 insertions(+)
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
new file mode 100644
index 00000000000..c864020514e
--- /dev/null
+++ b/sys-power/powertop/files/0001-configure.ac-Use-PKG_PROG_PKG_CONFIG-macro.patch
@@ -0,0 +1,62 @@
+From 311b88d2a078aa68b042dc37b416a9bdb3f650e5 Mon Sep 17 00:00:00 2001
+From: Ed Baker <edward.baker@intel.com>
+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
+ <snip>
+ 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
+<snip>
+
+The environment variable is populated for board specific tooling.
+declare -x PKG_CONFIG="/build/volteer/build/bin/pkg-config"
+
+Signed-off-by: Ed Baker <edward.baker@intel.com>
+---
+ 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.ebuild b/sys-power/powertop/powertop-2.13-r1.ebuild
similarity index 98%
rename from sys-power/powertop/powertop-2.13.ebuild
rename to sys-power/powertop/powertop-2.13-r1.ebuild
index c3f8c053410..ef1f63925d7 100644
--- a/sys-power/powertop/powertop-2.13.ebuild
+++ b/sys-power/powertop/powertop-2.13-r1.ebuild
@@ -41,6 +41,7 @@ RDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-2.8-ncurses_tinfo.patch
+ "${FILESDIR}"/0001-configure.ac-Use-PKG_PROG_PKG_CONFIG-macro.patch
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/powertop/files/, sys-power/powertop/
@ 2021-09-10 1:20 Matt Turner
0 siblings, 0 replies; 4+ messages in thread
From: Matt Turner @ 2021-09-10 1:20 UTC (permalink / raw
To: gentoo-commits
commit: f713e72a8e9558c9a00621f7fa1fd2eef29cf2b4
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 9 23:51:39 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Sep 10 01:19:43 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f713e72a
sys-power/powertop: Version bump to 2.14
Closes: https://bugs.gentoo.org/812140
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
sys-power/powertop/Manifest | 1 +
...igure-Remove-AX-macros-from-configure.ac-.patch | 60 ++++++++++++++++++++++
.../2.14-configure-Use-AX_REQUIRE_DEFINED.patch | 28 ++++++++++
.../{powertop-9999.ebuild => powertop-2.14.ebuild} | 9 ++--
sys-power/powertop/powertop-9999.ebuild | 3 --
5 files changed, 95 insertions(+), 6 deletions(-)
diff --git a/sys-power/powertop/Manifest b/sys-power/powertop/Manifest
index 98398aedba9..7509e164f2d 100644
--- a/sys-power/powertop/Manifest
+++ b/sys-power/powertop/Manifest
@@ -1 +1,2 @@
DIST powertop-2.13.tar.gz 303030 BLAKE2B 3c88e05f9889cc4b276bea3bc50a3a83228ca8efae278379a14fadc6104754f2837174e028bf9c5ded9f3af84ce6b8766ac3d24b6ae62b9b192c03fc3afdec11 SHA512 8ebeccd17b6f76d9e445382d9ce5b1c00ab2daf4f1e6e133c249bceb35ea582ca3e76da5415fd0b55a28b8a124655dc5ac7a18aaf2a3df955547d77495e59181
+DIST powertop-2.14.tar.gz 302578 BLAKE2B 5f53f81b01e83004f6436f497818d2a552b5e7ffda5007749aad415773adeab2a256aeffbacbf9e5fe803ff343a0c1954b5264aebdffa841bb70406b8b9611bc SHA512 f3e25901fb29405e0c8016643855a209cf9dba589fe9dd3e27c291d44699cebeb00dc8c7264c24436db08deb496759bd106666cb52d9ebd5f831bbb99e30f20f
diff --git a/sys-power/powertop/files/2.14-Revert-configure-Remove-AX-macros-from-configure.ac-.patch b/sys-power/powertop/files/2.14-Revert-configure-Remove-AX-macros-from-configure.ac-.patch
new file mode 100644
index 00000000000..7f2b7820ff2
--- /dev/null
+++ b/sys-power/powertop/files/2.14-Revert-configure-Remove-AX-macros-from-configure.ac-.patch
@@ -0,0 +1,60 @@
+From 2eb781ba822f2d57420400f648f6f531689c8c5d Mon Sep 17 00:00:00 2001
+From: David King <amigadave@amigadave.com>
+Date: Thu, 15 Apr 2021 11:37:24 +0100
+Subject: [PATCH 1/2] Revert "configure: Remove AX macros from configure.ac
+ file"
+
+This reverts commit 1e478d84f051ba56962a1214cb750b810379ac1d.
+---
+ README.md | 4 ++--
+ configure.ac | 9 +++++++++
+ 2 files changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/README.md b/README.md
+index 1b17365..43bd5b2 100644
+--- a/README.md
++++ b/README.md
+@@ -26,7 +26,7 @@ Example packages to install in Ubuntu*:
+
+ sudo apt install libpci-dev libnl-3-dev libnl-genl-3-dev gettext \
+ libgettextpo-dev autopoint gettext libncurses5-dev libncursesw5-dev libtool-bin \
+- dh-autoreconf pkg-config
++ dh-autoreconf autoconf-archive pkg-config
+
+
+ ## Building PowerTOP
+@@ -39,7 +39,7 @@ source files are modified.
+ To build PowerTOP from the cloned source, use the following commands:
+
+ ./autogen.sh
+- ./configure LDFLAGS='-pthread'
++ ./configure
+ make
+
+
+diff --git a/configure.ac b/configure.ac
+index 2571c5d..7eeeb9c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -36,9 +36,18 @@ AC_PROG_LIBTOOL
+ AC_PROG_CC
+ 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([
++ LIBS="$PTHREAD_LIBS $LIBS"
++ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++ CC="$PTHREAD_CC"
++ ], [
++ AC_MSG_ERROR([Could not configure pthreads support])
++])
+
+ # Checks for header files.
+ AC_CHECK_HEADERS([ \
+--
+2.32.0
+
diff --git a/sys-power/powertop/files/2.14-configure-Use-AX_REQUIRE_DEFINED.patch b/sys-power/powertop/files/2.14-configure-Use-AX_REQUIRE_DEFINED.patch
new file mode 100644
index 00000000000..f036bf73d61
--- /dev/null
+++ b/sys-power/powertop/files/2.14-configure-Use-AX_REQUIRE_DEFINED.patch
@@ -0,0 +1,28 @@
+From e87357a35f376518c3663a2f5cac53e9c4917427 Mon Sep 17 00:00:00 2001
+From: David King <amigadave@amigadave.com>
+Date: Thu, 15 Apr 2021 11:45:13 +0100
+Subject: [PATCH 2/2] configure: Use AX_REQUIRE_DEFINED
+
+Require additional macros to be defined early, to avoid an aclocal
+"too many loops" error when copying macros.
+---
+ configure.ac | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 7eeeb9c..37c1304 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -29,6 +29,9 @@ AM_GNU_GETTEXT([external])
+ AM_GNU_GETTEXT_VERSION([0.18.2])
+
+ m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
++AX_REQUIRE_DEFINED([AX_ADD_FORTIFY_SOURCE])
++AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX])
++AX_REQUIRE_DEFINED([AX_PTHREAD])
+ # Checks for programs.
+ AC_PROG_CPP
+ AC_PROG_CXX
+--
+2.32.0
+
diff --git a/sys-power/powertop/powertop-9999.ebuild b/sys-power/powertop/powertop-2.14.ebuild
similarity index 94%
copy from sys-power/powertop/powertop-9999.ebuild
copy to sys-power/powertop/powertop-2.14.ebuild
index 92a8b30bd07..378581ae5c2 100644
--- a/sys-power/powertop/powertop-9999.ebuild
+++ b/sys-power/powertop/powertop-2.14.ebuild
@@ -39,6 +39,12 @@ RDEPEND="
virtual/libintl
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.8-ncurses_tinfo.patch
+ "${FILESDIR}"/${PV}-Revert-configure-Remove-AX-macros-from-configure.ac-.patch
+ "${FILESDIR}"/${PV}-configure-Use-AX_REQUIRE_DEFINED.patch
+)
+
pkg_setup() {
CONFIG_CHECK="
~X86_MSR
@@ -100,9 +106,6 @@ pkg_setup() {
src_prepare() {
default
- # Bug 599114
- sed -i '1s|^|AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX])|' configure.ac || die
-
eautoreconf
}
diff --git a/sys-power/powertop/powertop-9999.ebuild b/sys-power/powertop/powertop-9999.ebuild
index 92a8b30bd07..b0062714c6c 100644
--- a/sys-power/powertop/powertop-9999.ebuild
+++ b/sys-power/powertop/powertop-9999.ebuild
@@ -100,9 +100,6 @@ pkg_setup() {
src_prepare() {
default
- # Bug 599114
- sed -i '1s|^|AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX])|' configure.ac || die
-
eautoreconf
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/powertop/files/, sys-power/powertop/
@ 2023-03-02 1:29 Matt Turner
0 siblings, 0 replies; 4+ messages in thread
From: Matt Turner @ 2023-03-02 1:29 UTC (permalink / raw
To: gentoo-commits
commit: 37ee174421b6f5279221551a764a9a05cbaa098a
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 2 01:18:52 2023 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Mar 2 01:29:23 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37ee1744
sys-power/powertop: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
sys-power/powertop/Manifest | 1 -
...igure-Remove-AX-macros-from-configure.ac-.patch | 60 -----------
.../2.14-configure-Use-AX_REQUIRE_DEFINED.patch | 28 -----
sys-power/powertop/powertop-2.14.ebuild | 115 ---------------------
4 files changed, 204 deletions(-)
diff --git a/sys-power/powertop/Manifest b/sys-power/powertop/Manifest
index fe088bdc7752..9f04e847a444 100644
--- a/sys-power/powertop/Manifest
+++ b/sys-power/powertop/Manifest
@@ -1,2 +1 @@
-DIST powertop-2.14.tar.gz 302578 BLAKE2B 5f53f81b01e83004f6436f497818d2a552b5e7ffda5007749aad415773adeab2a256aeffbacbf9e5fe803ff343a0c1954b5264aebdffa841bb70406b8b9611bc SHA512 f3e25901fb29405e0c8016643855a209cf9dba589fe9dd3e27c291d44699cebeb00dc8c7264c24436db08deb496759bd106666cb52d9ebd5f831bbb99e30f20f
DIST powertop-2.15.tar.gz 302891 BLAKE2B f554ee9499c78f1888ecd58a1a357bc6f29f53ae2d3bf6b2819d760afe901f5d5394665a2e6a3ecae9b48cbf9703532feb5c16da9bd3edd4f1d31fe12610a2da SHA512 de4ca3ea25697d2cd5f05c41c82c326ad3e2d21cbf38ddb9b3af40c0d862a70781ca45d9ef7b735ad6def0cb580e4fa153eb4a6e6598e204fc931b30d85ecf41
diff --git a/sys-power/powertop/files/2.14-Revert-configure-Remove-AX-macros-from-configure.ac-.patch b/sys-power/powertop/files/2.14-Revert-configure-Remove-AX-macros-from-configure.ac-.patch
deleted file mode 100644
index 7f2b7820ff2f..000000000000
--- a/sys-power/powertop/files/2.14-Revert-configure-Remove-AX-macros-from-configure.ac-.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 2eb781ba822f2d57420400f648f6f531689c8c5d Mon Sep 17 00:00:00 2001
-From: David King <amigadave@amigadave.com>
-Date: Thu, 15 Apr 2021 11:37:24 +0100
-Subject: [PATCH 1/2] Revert "configure: Remove AX macros from configure.ac
- file"
-
-This reverts commit 1e478d84f051ba56962a1214cb750b810379ac1d.
----
- README.md | 4 ++--
- configure.ac | 9 +++++++++
- 2 files changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/README.md b/README.md
-index 1b17365..43bd5b2 100644
---- a/README.md
-+++ b/README.md
-@@ -26,7 +26,7 @@ Example packages to install in Ubuntu*:
-
- sudo apt install libpci-dev libnl-3-dev libnl-genl-3-dev gettext \
- libgettextpo-dev autopoint gettext libncurses5-dev libncursesw5-dev libtool-bin \
-- dh-autoreconf pkg-config
-+ dh-autoreconf autoconf-archive pkg-config
-
-
- ## Building PowerTOP
-@@ -39,7 +39,7 @@ source files are modified.
- To build PowerTOP from the cloned source, use the following commands:
-
- ./autogen.sh
-- ./configure LDFLAGS='-pthread'
-+ ./configure
- make
-
-
-diff --git a/configure.ac b/configure.ac
-index 2571c5d..7eeeb9c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -36,9 +36,18 @@ AC_PROG_LIBTOOL
- AC_PROG_CC
- 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([
-+ LIBS="$PTHREAD_LIBS $LIBS"
-+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+ CC="$PTHREAD_CC"
-+ ], [
-+ AC_MSG_ERROR([Could not configure pthreads support])
-+])
-
- # Checks for header files.
- AC_CHECK_HEADERS([ \
---
-2.32.0
-
diff --git a/sys-power/powertop/files/2.14-configure-Use-AX_REQUIRE_DEFINED.patch b/sys-power/powertop/files/2.14-configure-Use-AX_REQUIRE_DEFINED.patch
deleted file mode 100644
index f036bf73d619..000000000000
--- a/sys-power/powertop/files/2.14-configure-Use-AX_REQUIRE_DEFINED.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From e87357a35f376518c3663a2f5cac53e9c4917427 Mon Sep 17 00:00:00 2001
-From: David King <amigadave@amigadave.com>
-Date: Thu, 15 Apr 2021 11:45:13 +0100
-Subject: [PATCH 2/2] configure: Use AX_REQUIRE_DEFINED
-
-Require additional macros to be defined early, to avoid an aclocal
-"too many loops" error when copying macros.
----
- configure.ac | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 7eeeb9c..37c1304 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -29,6 +29,9 @@ AM_GNU_GETTEXT([external])
- AM_GNU_GETTEXT_VERSION([0.18.2])
-
- m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
-+AX_REQUIRE_DEFINED([AX_ADD_FORTIFY_SOURCE])
-+AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX])
-+AX_REQUIRE_DEFINED([AX_PTHREAD])
- # Checks for programs.
- AC_PROG_CPP
- AC_PROG_CXX
---
-2.32.0
-
diff --git a/sys-power/powertop/powertop-2.14.ebuild b/sys-power/powertop/powertop-2.14.ebuild
deleted file mode 100644
index 824c7e799309..000000000000
--- a/sys-power/powertop/powertop-2.14.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://github.com/fenrus75/powertop.git"
-
-if [[ ${PV} == "9999" ]] ; then
- GIT_ECLASS="git-r3"
- SRC_URI=""
-else
- SRC_URI="https://github.com/fenrus75/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 arm ~arm64 ppc sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-inherit autotools ${GIT_ECLASS} linux-info
-
-DESCRIPTION="tool to diagnose issues with power consumption and power management"
-HOMEPAGE="https://01.org/powertop/ https://github.com/fenrus75/powertop/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls unicode X"
-
-DEPEND="
- dev-libs/libnl:3
- sys-apps/pciutils
- sys-libs/ncurses:=[unicode(+)?]
-"
-
-BDEPEND="
- virtual/pkgconfig
- sys-devel/autoconf-archive
- >=sys-devel/gettext-0.20.2
-"
-RDEPEND="
- ${DEPEND}
- X? ( x11-apps/xset )
- virtual/libintl
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.8-ncurses_tinfo.patch
- "${FILESDIR}"/${PV}-Revert-configure-Remove-AX-macros-from-configure.ac-.patch
- "${FILESDIR}"/${PV}-configure-Use-AX_REQUIRE_DEFINED.patch
-)
-
-pkg_setup() {
- CONFIG_CHECK="
- ~X86_MSR
- ~DEBUG_FS
- ~PERF_EVENTS
- ~TRACEPOINTS
- ~NO_HZ_IDLE
- ~HIGH_RES_TIMERS
- ~HPET_TIMER
- ~CPU_FREQ_STAT
- ~CPU_FREQ_GOV_ONDEMAND
- ~FTRACE
- ~BLK_DEV_IO_TRACE
- ~TRACING
- "
- ERROR_KERNEL_X86_MSR="X86_MSR is not enabled in the kernel, you almost certainly need it"
- ERROR_KERNEL_DEBUG_FS="DEBUG_FS is not enabled in the kernel, you almost certainly need it"
- ERROR_KERNEL_PERF_EVENTS="PERF_EVENTS should be enabled in the kernel for full powertop function"
- ERROR_KERNEL_TRACEPOINTS="TRACEPOINTS should be enabled in the kernel for full powertop function"
- ERROR_KERNEL_NO_HZ_IDLE="NO_HZ_IDLE should be enabled in the kernel for full powertop function"
- ERROR_KERNEL_HIGH_RES_TIMERS="HIGH_RES_TIMERS should be enabled in the kernel for full powertop function"
- ERROR_KERNEL_HPET_TIMER="HPET_TIMER should be enabled in the kernel for full powertop function"
- ERROR_KERNEL_CPU_FREQ_STAT="CPU_FREQ_STAT should be enabled in the kernel for full powertop function"
- ERROR_KERNEL_CPU_FREQ_GOV_ONDEMAND="CPU_FREQ_GOV_ONDEMAND should be enabled in the kernel for full powertop function"
- ERROR_KERNEL_FTRACE="FTRACE needs to be turned on to enable BLK_DEV_IO_TRACE"
- ERROR_KERNEL_BLK_DEV_IO_TRACE="BLK_DEV_IO_TRACE needs to be turned on to enable other config options"
- ERROR_KERNEL_TRACING="TRACING should be enabled in the kernel for full powertop function"
- linux-info_pkg_setup
- if linux_config_exists; then
- if kernel_is -lt 3 7 0; then
- if linux_chkconfig_present SND_HDA_INTEL; then
- CONFIG_CHECK="~SND_HDA_POWER_SAVE"
- ERROR_KERNEL_SND_HDA_POWER_SAVE="SND_HDA_POWER_SAVE should be enabled in the kernel for full powertop function"
- check_extra_config
- fi
- fi
- if kernel_is -lt 3 9 0; then
- CONFIG_CHECK="~EVENT_POWER_TRACING_DEPRECATED"
- ERROR_KERNEL_EVENT_POWER_TRACING_DEPRECATED="EVENT_POWER_TRACING_DEPRECATED should be enabled in the kernel for full powertop function"
- check_extra_config
- fi
- if kernel_is -lt 3 19; then
- CONFIG_CHECK="~PM_RUNTIME"
- ERROR_KERNEL_PM_RUNTIME="PM_RUNTIME should be enabled in the kernel for full powertop function"
- check_extra_config
- else
- CONFIG_CHECK="~PM"
- ERROR_KERNEL_PM="PM should be enabled in the kernel for full powertop function"
- check_extra_config
- fi
- if kernel_is -lt 4 11; then
- CONFIG_CHECK="~TIMER_STATS"
- ERROR_KERNEL_TIMER_STATS="TIMER_STATS should be enabled in the kernel for full powertop function"
- check_extra_config
- fi
- fi
-}
-
-src_prepare() {
- default
-
- eautoreconf
-}
-
-src_configure() {
- export ac_cv_search_delwin=$(usex unicode -lncursesw -lncurses)
- econf $(use_enable nls)
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-03-02 1:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-07-28 16:40 [gentoo-commits] repo/gentoo:master commit in: sys-power/powertop/files/, sys-power/powertop/ Matt Turner
-- strict thread matches above, loose matches on Subject: below --
2020-09-24 17:05 Matt Turner
2021-09-10 1:20 Matt Turner
2023-03-02 1:29 Matt Turner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox