diff options
| author |   Zentaro Kavanagh <zentaro@chromium.org> | 2018-06-14 13:40:54 -0700 |
|---|---|---|
| committer |   Mike Frysinger <vapier@gentoo.org> | 2018-06-18 10:54:21 -0400 |
| commit | b58dab88294efd16e05c66a751d606235b103dbf (patch) | |
| tree | ecb72bf3e2578e52fd7fdc515cd0b82313cbabd1 /sys-power/powertop/files | |
| parent | app-emulation/reg: Remove old (diff) | |
| download | gentoo-b58dab88294efd16e05c66a751d606235b103dbf.tar.gz gentoo-b58dab88294efd16e05c66a751d606235b103dbf.tar.bz2 gentoo-b58dab88294efd16e05c66a751d606235b103dbf.zip | |
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]
Diffstat (limited to 'sys-power/powertop/files')
| -rw-r--r-- | sys-power/powertop/files/powertop-2.8-ncurses_tinfo.patch | 41 |
1 files changed, 41 insertions, 0 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 000000000000..97769fb6728e --- /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 <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 + |