diff options
Diffstat (limited to 'meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch')
| -rw-r--r-- | meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch b/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch index ff5cd49237..fc0d86e335 100644 --- a/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch +++ b/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch @@ -1,36 +1,32 @@ -From 7ebcbf17ad9483c7109e4a83b66966bc02f09bd4 Mon Sep 17 00:00:00 2001 -From: Paul Barker <pbarker@toganlabs.com> -Date: Sun, 5 Nov 2017 20:10:10 +0000 -Subject: [PATCH] Use pkg-config - 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 | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac -index 7e0edd1..c5a8365 100644 +index 559dc4d..77aea22 100644 --- a/configure.ac +++ b/configure.ac -@@ -185,9 +185,9 @@ m4_define([HTOP_CHECK_LIB], +@@ -185,10 +185,10 @@ m4_define([HTOP_CHECK_LIB], AC_ARG_ENABLE(unicode, [AS_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="yes") if test "x$enable_unicode" = xyes; then - HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config", -- HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw5-config", -- HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "ncurses5-config", +- HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config", +- HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw5-config", +- HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "ncurses5-config", + HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw6", -+ HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw5", -+ HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [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], -@@ -200,8 +200,8 @@ if test "x$enable_unicode" = xyes; then ++ HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw6", ++ HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw5", ++ HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [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], +@@ -201,8 +201,8 @@ if test "x$enable_unicode" = xyes; then [AC_CHECK_HEADERS([ncurses/curses.h],[:], [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])]) else @@ -41,6 +37,3 @@ index 7e0edd1..c5a8365 100644 HTOP_CHECK_LIB([ncurses6], [refresh], [HAVE_LIBNCURSES], HTOP_CHECK_LIB([ncurses], [refresh], [HAVE_LIBNCURSES], missing_libraries="$missing_libraries libncurses" --- -2.7.4 - |