gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

sys-power/powertop: Support ncurses with tinfo

Browse Source 
- 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]
This commit is contained in:
Zentaro Kavanagh
2018-06-14 13:40:54 -07:00
committed by Mike Frysinger
parent 9201118540
commit b58dab8829
3 changed files with 52 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
sys-power/powertop/files/powertop-2.8-ncurses_tinfo.patch Normal file
View File

@@ -0,0 +1,41 @@
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

11
sys-power/powertop/powertop-2.8.ebuild
View File

@@ -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} == "9999" ]] ; then
eautoreconf
else
default
fi
epatch "${FILESDIR}"/${P}-ncurses_tinfo.patch
# Call eautoreconf since ncurses patch touches configure.ac.
eautoreconf
}
src_configure() {

8
sys-power/powertop/powertop-2.9.ebuild
View File

@@ -3,7 +3,7 @@
EAPI="6"
inherit eutils linux-info
inherit eutils linux-info autotools
if [[ ${PV} == "9999" ]] ; 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} == "9999" ]] ; 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() {