diff options
| author |   Paul Barker <pbarker@toganlabs.com> | 2017-11-05 22:07:30 +0000 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2017-11-15 16:34:05 -0800 |
| commit | bcf2c8fe6e4de4324c8aaf0c27cfad2b13fd93d6 (patch) | |
| tree | d525f09be5c81f10bd77a844c8a8378f4192e902 /meta-oe | |
| parent | 6f3368cebe96113dd8d371cc53879a9bf521516b (diff) | |
| download | meta-openembedded-contrib-bcf2c8fe6e4de4324c8aaf0c27cfad2b13fd93d6.tar.gz | |
htop: Update to v2.0.2
Signed-off-by: Paul Barker <pbarker@toganlabs.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch | 46 | ||||
| -rw-r--r-- | meta-oe/recipes-support/htop/htop_2.0.2.bb (renamed from meta-oe/recipes-support/htop/htop_1.0.3.bb) | 9 |
2 files changed, 52 insertions, 3 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 new file mode 100644 index 0000000000..ff5cd49237 --- /dev/null +++ b/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch @@ -0,0 +1,46 @@ +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> +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 +--- a/configure.ac ++++ b/configure.ac +@@ -185,9 +185,9 @@ 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([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 + [AC_CHECK_HEADERS([ncurses/curses.h],[:], + [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])]) + else +- HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config", +- HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config", ++ HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "pkg-config ncurses6", ++ HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "pkg-config ncurses5", + HTOP_CHECK_LIB([ncurses6], [refresh], [HAVE_LIBNCURSES], + HTOP_CHECK_LIB([ncurses], [refresh], [HAVE_LIBNCURSES], + missing_libraries="$missing_libraries libncurses" +-- +2.7.4 + diff --git a/meta-oe/recipes-support/htop/htop_1.0.3.bb b/meta-oe/recipes-support/htop/htop_2.0.2.bb index 181661af72..395b83ff66 100644 --- a/meta-oe/recipes-support/htop/htop_1.0.3.bb +++ b/meta-oe/recipes-support/htop/htop_2.0.2.bb @@ -8,10 +8,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c312653532e8e669f30e5ec8bdc23be3" DEPENDS = "ncurses" RDEPENDS_${PN} = "ncurses-terminfo" -SRC_URI = "http://hisham.hm/htop/releases/${PV}/htop-${PV}.tar.gz" +SRC_URI = " \ + http://hisham.hm/htop/releases/${PV}/htop-${PV}.tar.gz \ + file://0001-Use-pkg-config.patch \ + " -SRC_URI[md5sum] = "e768b9b55c033d9c1dffda72db3a6ac7" -SRC_URI[sha256sum] = "055c57927f75847fdc222b5258b079a9542811a9dcf5421c615c7e17f55d1829" +SRC_URI[md5sum] = "7d354d904bad591a931ad57e99fea84a" +SRC_URI[sha256sum] = "179be9dccb80cee0c5e1a1f58c8f72ce7b2328ede30fb71dcdf336539be2f487" LDFLAGS_append_libc-uclibc = " -lubacktrace" |