diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support/htop')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch | 39 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/htop/htop_2.1.0.bb | 35 |
2 files changed, 74 insertions, 0 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch b/meta-openembedded/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch new file mode 100644 index 000000000..fc0d86e33 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch @@ -0,0 +1,39 @@ +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) + +diff --git a/configure.ac b/configure.ac +index 559dc4d..77aea22 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -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], "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 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 +- 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" diff --git a/meta-openembedded/meta-oe/recipes-support/htop/htop_2.1.0.bb b/meta-openembedded/meta-oe/recipes-support/htop/htop_2.1.0.bb new file mode 100644 index 000000000..33508f984 --- /dev/null +++ b/meta-openembedded/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_URI[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 +} |