mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-09-07 05:27:39 +00:00
cef2d1429b
Upstream renamed the branch to "main", update SRC_URI.
Refresh pkg-config patch.
Update PACKAGECONFIG options. The linux-affinity option was renamed to
affinity. Add a packageconfig conflict between affinity and hwloc, since
these are mutually exclusive. The setuid option was removed by upstream,
and a capabilities option added. The sensors option switched from
--with/--without to --enable/--disable. Reorder the option to match the
order used in the configure script to make future updates easier.
License-Update: The previous license contained an exception for the
Portable Linux Processor Affinity (PLPA) project. This exception has
been removed, so the project uses an unmodified GPLv2 license. Minor
formatting and whitespace changes were also made to match the license
text as published by the FSF. Commit making change:
088dc5b9a7
Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
49 lines
2.5 KiB
Diff
49 lines
2.5 KiB
Diff
From 98ed72177c49a8015a443b3ec272fee3fb5a4eb3 Mon Sep 17 00:00:00 2001
|
|
From: Paul Barker <pbarker@toganlabs.com>
|
|
Date: Sun, 5 Nov 2017 22:07:30 +0000
|
|
Subject: [PATCH] htop: Update to v2.0.2
|
|
|
|
We need to use pkg-config to find the ncurses library instead of the
|
|
ncurses*-config applications.
|
|
|
|
Signed-off-by: Paul Barker <pbarker@toganlabs.com>
|
|
Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org>
|
|
|
|
Upstream-status: Inappropriate
|
|
(`ncurses*-config` can be used outside of OpenEmbedded)
|
|
|
|
---
|
|
configure.ac | 12 ++++++------
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 0e69096..d20014f 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -322,10 +322,10 @@ AC_ARG_ENABLE([unicode],
|
|
[],
|
|
[enable_unicode=yes])
|
|
if test "x$enable_unicode" = xyes; then
|
|
- HTOP_CHECK_SCRIPT([ncursesw6], [waddwstr], [HAVE_LIBNCURSESW], "ncursesw6-config",
|
|
- HTOP_CHECK_SCRIPT([ncursesw], [waddwstr], [HAVE_LIBNCURSESW], "ncursesw6-config",
|
|
- HTOP_CHECK_SCRIPT([ncursesw], [wadd_wch], [HAVE_LIBNCURSESW], "ncursesw5-config",
|
|
- HTOP_CHECK_SCRIPT([ncurses], [wadd_wch], [HAVE_LIBNCURSESW], "ncurses5-config",
|
|
+ HTOP_CHECK_SCRIPT([ncursesw6], [waddwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw6",
|
|
+ HTOP_CHECK_SCRIPT([ncursesw], [waddwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw6",
|
|
+ HTOP_CHECK_SCRIPT([ncursesw], [wadd_wch], [HAVE_LIBNCURSESW], "pkg-config ncursesw5",
|
|
+ HTOP_CHECK_SCRIPT([ncurses], [wadd_wch], [HAVE_LIBNCURSESW], "pkg-config ncurses5",
|
|
HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW],
|
|
HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW],
|
|
HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW],
|
|
@@ -342,8 +342,8 @@ if test "x$enable_unicode" = xyes; then
|
|
# (at this point we already link against a working ncurses library with wide character support)
|
|
AC_SEARCH_LIBS([keypad], [tinfow tinfo])
|
|
else
|
|
- HTOP_CHECK_SCRIPT([ncurses6], [wnoutrefresh], [HAVE_LIBNCURSES], [ncurses6-config],
|
|
- HTOP_CHECK_SCRIPT([ncurses], [wnoutrefresh], [HAVE_LIBNCURSES], [ncurses5-config],
|
|
+ HTOP_CHECK_SCRIPT([ncurses6], [wnoutrefresh], [HAVE_LIBNCURSES], [pkg-config ncurses6],
|
|
+ HTOP_CHECK_SCRIPT([ncurses], [wnoutrefresh], [HAVE_LIBNCURSES], [pkg-config ncurses5],
|
|
HTOP_CHECK_LIB([ncurses6], [doupdate], [HAVE_LIBNCURSES],
|
|
HTOP_CHECK_LIB([ncurses], [doupdate], [HAVE_LIBNCURSES],
|
|
HTOP_CHECK_LIB([curses], [doupdate], [HAVE_LIBNCURSES],
|