Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- ➜ htop tree .
- .
- ├── files
- │ └── 0001-Use-pkg-config.patch
- └── htop_git.bb
- 1 directory, 2 files
- ➜ htop cat files/0001-Use-pkg-config.patch
- 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"
- ➜ htop cat htop_git.bb
- # Recipe created by recipetool
- # This is the basis of a recipe and may need further editing in order to be fully functional.
- # (Feel free to remove these comments when editing.)
- # WARNING: the following LICENSE and LIC_FILES_CHKSUM values are best guesses - it is
- # your responsibility to verify that the values are complete and correct.
- #
- # The following license files were not able to be identified and are
- # represented as "Unknown" below, you will need to check them yourself:
- # COPYING
- LICENSE = "Unknown"
- LIC_FILES_CHKSUM = "file://COPYING;md5=4099d367cd5e59b6d4fc1ee33accb891"
- SRC_URI = "git://github.com/htop-dev/htop;protocol=https \
- file://0001-Use-pkg-config.patch \
- "
- # Modify these as desired
- PV = "3.0.2+git${SRCPV}"
- SRCREV = "e0e5997c53ca9b61171d01b5a30c40d915622de2"
- S = "${WORKDIR}/git"
- # NOTE: the following library dependencies are unknown, ignoring: malloc proc hwloc kvm kstat
- # (this is based on recipes that have previously been built and packaged)
- DEPENDS = "libnl ncurses"
- # NOTE: if this software is not capable of being built in a separate build directory
- # from the source, you should replace autotools with autotools-brokensep in the
- # inherit line
- inherit pkgconfig autotools
- # Specify any options you want to pass to the configure script using EXTRA_OECONF:
- EXTRA_OECONF = "--disable-unicode"
Add Comment
Please, Sign In to add comment