diff options
author | Robert Joslyn <robert.joslyn@redrectangle.org> | 2018-04-08 11:25:06 -0700 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-05-01 18:12:49 -0700 |
commit | 5818f54160016088c79030217fe80f2688714546 (patch) | |
tree | da486cc25358cad414bb337a50c9abe07bf3b23e /meta-oe/recipes-support/htop | |
parent | 9c96e14e5e16b9d70ee5716f00fb5b0972b1239d (diff) | |
download | meta-openembedded-contrib-5818f54160016088c79030217fe80f2688714546.tar.gz |
htop: Update to 2.1.0
Add PACKAGECONFIG options and update formatting to better conform to the
style guide.
Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/htop')
-rw-r--r-- | meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch | 35 | ||||
-rw-r--r-- | meta-oe/recipes-support/htop/htop_2.0.2.bb | 25 | ||||
-rw-r--r-- | meta-oe/recipes-support/htop/htop_2.1.0.bb | 35 |
3 files changed, 49 insertions, 46 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 ff5cd49237d..fc0d86e3356 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 - diff --git a/meta-oe/recipes-support/htop/htop_2.0.2.bb b/meta-oe/recipes-support/htop/htop_2.0.2.bb deleted file mode 100644 index 395b83ff66f..00000000000 --- a/meta-oe/recipes-support/htop/htop_2.0.2.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "htop process monitor" -HOMEPAGE = "http://htop.sf.net" -SECTION = "console/utils" -LICENSE = "GPLv2" - -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 \ - file://0001-Use-pkg-config.patch \ - " - -SRC_URI[md5sum] = "7d354d904bad591a931ad57e99fea84a" -SRC_URI[sha256sum] = "179be9dccb80cee0c5e1a1f58c8f72ce7b2328ede30fb71dcdf336539be2f487" - -LDFLAGS_append_libc-uclibc = " -lubacktrace" - -do_configure_prepend () { - rm -rf ${S}/config.h -} - -inherit autotools diff --git a/meta-oe/recipes-support/htop/htop_2.1.0.bb b/meta-oe/recipes-support/htop/htop_2.1.0.bb new file mode 100644 index 00000000000..5ff2fcfbfa5 --- /dev/null +++ b/meta-oe/recipes-support/htop/htop_2.1.0.bb @@ -0,0 +1,35 @@ +SUMMARY = "Interactive process viewer" +HOMEPAGE = "http://hisham.hm/htop" +SECTION = "console/utils" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=c312653532e8e669f30e5ec8bdc23be3" + +DEPENDS = "ncurses" + +SRC_URI = "http://hisham.hm/htop/releases/${PV}/${BP}.tar.gz \ + file://0001-Use-pkg-config.patch" +SRC_URt[md5sum] = "f262b66ad6c194782f4d3a80627e84c8" +SRC_URI[sha256sum] = "3260be990d26e25b6b49fc9d96dbc935ad46e61083c0b7f6df413e513bf80748" + +inherit autotools pkgconfig + +PACKAGECONFIG ??= "proc \ + cgroup \ + taskstats \ + unicode \ + linux-affinity \ + delayacct" +PACKAGECONFIG[proc] = "--enable-proc,--disable-proc" +PACKAGECONFIG[openvz] = "--enable-openvz,--disable-openvz" +PACKAGECONFIG[cgroup] = "--enable-cgroup,--disable-cgroup" +PACKAGECONFIG[vserver] = "--enable-vserver,--disable-vserver" +PACKAGECONFIG[taskstats] = "--enable-taskstats,--disable-taskstats" +PACKAGECONFIG[unicode] = "--enable-unicode,--disable-unicode" +PACKAGECONFIG[linux-affinity] = "--enable-linux-affinity,--disable-linux-affinity" +PACKAGECONFIG[hwloc] = "--enable-hwloc,--disable-hwloc,hwloc" +PACKAGECONFIG[setuid] = "--enable-setuid,--disable-setuid" +PACKAGECONFIG[delayacct] = "--enable-delayacct,--disable-delayacct,libnl" + +do_configure_prepend () { + rm -rf ${S}/config.h +} |