Guest User

Untitled

a guest
Sep 22nd, 2020
71
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 3.82 KB | None | 0 0
  1. ➜ htop tree .
  2. .
  3. ├── files
  4. │   └── 0001-Use-pkg-config.patch
  5. └── htop_git.bb
  6.  
  7. 1 directory, 2 files
  8. ➜ htop cat files/0001-Use-pkg-config.patch
  9. We need to use pkg-config to find the ncurses library instead of the
  10. ncurses*-config applications.
  11.  
  12. Signed-off-by: Paul Barker <pbarker@toganlabs.com>
  13. Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org>
  14.  
  15. Upstream-status: Inappropriate
  16. (`ncurses*-config` can be used outside of OpenEmbedded)
  17.  
  18. diff --git a/configure.ac b/configure.ac
  19. index 559dc4d..77aea22 100644
  20. --- a/configure.ac
  21. +++ b/configure.ac
  22. @@ -185,10 +185,10 @@ m4_define([HTOP_CHECK_LIB],
  23.  
  24. AC_ARG_ENABLE(unicode, [AS_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="yes")
  25. if test "x$enable_unicode" = xyes; then
  26. - HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config",
  27. - HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config",
  28. - HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw5-config",
  29. - HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "ncurses5-config",
  30. + HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw6",
  31. + HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw6",
  32. + HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw5",
  33. + HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncurses5",
  34. HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW],
  35. HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW],
  36. HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW],
  37. @@ -201,8 +201,8 @@ if test "x$enable_unicode" = xyes; then
  38. [AC_CHECK_HEADERS([ncurses/curses.h],[:],
  39. [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
  40. else
  41. - HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config",
  42. - HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config",
  43. + HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "pkg-config ncurses6",
  44. + HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "pkg-config ncurses5",
  45. HTOP_CHECK_LIB([ncurses6], [refresh], [HAVE_LIBNCURSES],
  46. HTOP_CHECK_LIB([ncurses], [refresh], [HAVE_LIBNCURSES],
  47. missing_libraries="$missing_libraries libncurses"
  48.  
  49. ➜ htop cat htop_git.bb
  50. # Recipe created by recipetool
  51. # This is the basis of a recipe and may need further editing in order to be fully functional.
  52. # (Feel free to remove these comments when editing.)
  53.  
  54. # WARNING: the following LICENSE and LIC_FILES_CHKSUM values are best guesses - it is
  55. # your responsibility to verify that the values are complete and correct.
  56. #
  57. # The following license files were not able to be identified and are
  58. # represented as "Unknown" below, you will need to check them yourself:
  59. # COPYING
  60. LICENSE = "Unknown"
  61. LIC_FILES_CHKSUM = "file://COPYING;md5=4099d367cd5e59b6d4fc1ee33accb891"
  62.  
  63. SRC_URI = "git://github.com/htop-dev/htop;protocol=https \
  64. file://0001-Use-pkg-config.patch \
  65. "
  66.  
  67. # Modify these as desired
  68. PV = "3.0.2+git${SRCPV}"
  69. SRCREV = "e0e5997c53ca9b61171d01b5a30c40d915622de2"
  70.  
  71. S = "${WORKDIR}/git"
  72.  
  73. # NOTE: the following library dependencies are unknown, ignoring: malloc proc hwloc kvm kstat
  74. # (this is based on recipes that have previously been built and packaged)
  75. DEPENDS = "libnl ncurses"
  76.  
  77. # NOTE: if this software is not capable of being built in a separate build directory
  78. # from the source, you should replace autotools with autotools-brokensep in the
  79. # inherit line
  80. inherit pkgconfig autotools
  81.  
  82. # Specify any options you want to pass to the configure script using EXTRA_OECONF:
  83. EXTRA_OECONF = "--disable-unicode"
  84.  
  85.  
Add Comment
Please, Sign In to add comment