From: "Matt Turner" <mattst88@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-power/powertop/files/, sys-power/powertop/
Date: Fri, 10 Sep 2021 01:20:17 +0000 (UTC) [thread overview]
Message-ID: <1631236783.f713e72a8e9558c9a00621f7fa1fd2eef29cf2b4.mattst88@gentoo> (raw)
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
}
next reply other threads:[~2021-09-10 1:20 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-10 1:20 Matt Turner [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-03-02 1:29 [gentoo-commits] repo/gentoo:master commit in: sys-power/powertop/files/, sys-power/powertop/ Matt Turner
2020-09-24 17:05 Matt Turner
2019-07-28 16:40 Matt Turner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1631236783.f713e72a8e9558c9a00621f7fa1fd2eef29cf2b4.mattst88@gentoo \
--to=mattst88@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox