aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/htop/files
diff options
context:
space:
mode:
authorDan McGregor <dan.mcgregor@usask.ca>2016-09-15 08:26:27 -0600
committerDan McGregor <dan.mcgregor@usask.ca>2016-12-16 16:00:26 -0600
commitfd795818770c1a3aa33f4df198e2a9b8319fd4e0 (patch)
tree464cd910a197976c1bdc12d2044246344528128a /meta-oe/recipes-support/htop/files
parent55c8a76da5dc099a7bc3838495c672140cedb78e (diff)
downloadmeta-openembedded-contrib-dankm/krogoth-htop.tar.gz
meta-openembedded-contrib-dankm/krogoth-htop.tar.bz2
meta-openembedded-contrib-dankm/krogoth-htop.zip
htop: update to 2.0.3dankm/krogoth-htop
Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
Diffstat (limited to 'meta-oe/recipes-support/htop/files')
-rw-r--r--meta-oe/recipes-support/htop/files/disable-script.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/htop/files/disable-script.patch b/meta-oe/recipes-support/htop/files/disable-script.patch
new file mode 100644
index 00000000000..404e76d7915
--- /dev/null
+++ b/meta-oe/recipes-support/htop/files/disable-script.patch
@@ -0,0 +1,34 @@
+diff --git a/configure.ac b/configure.ac
+index 3bd58bc..8ffcda4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -175,27 +175,22 @@ m4_define([HTOP_CHECK_LIB],
+
+ AC_ARG_ENABLE(unicode, [AC_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_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW],
+ HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW],
+ HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW],
+ missing_libraries="$missing_libraries libncursesw"
+ AC_MSG_ERROR([You may want to use --disable-unicode or install libncursesw.])
+- ))))))
++ )))
+
+ AC_CHECK_HEADERS([ncursesw/curses.h],[:],
+ [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
+ [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_LIB([ncurses6], [refresh], [HAVE_LIBNCURSES],
+ HTOP_CHECK_LIB([ncurses], [refresh], [HAVE_LIBNCURSES],
+ missing_libraries="$missing_libraries libncurses"
+- ))))
++ ))
+
+ AC_CHECK_HEADERS([curses.h],[:],
+ [AC_CHECK_HEADERS([ncurses/curses.h],[:],