diff options
| author | Ricardo Martincoski <ricardo.martincoski@gmail.com> | 2016-07-10 17:59:34 -0300 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2016-07-12 10:48:08 +0200 |
| commit | 9a742a1d8829c5fedb2181d061cc7875e00a7f37 (patch) | |
| tree | 620c9a5cabe003fb514daa55aaa454ebade544f9 /package/htop/0001-native-affinity.patch | |
| parent | 68790b5698dcbe456021cbf0779d836b12fe8710 (diff) | |
| download | buildroot-9a742a1d8829c5fedb2181d061cc7875e00a7f37.tar.gz buildroot-9a742a1d8829c5fedb2181d061cc7875e00a7f37.zip | |
htop: bump to version 2.0.1
- drop 0001-native-affinity.patch as it was replaced upstream [1]. Autoreconf
could be dropped
- drop conf env ac_cv_file__proc_stat=yes ac_cv_file__proc_meminfo=yes because
these tests no longer run when cross-compiling [2]
- upstream created a custom check function to use ncurses*-config [3] but it
does not allow to override the path to ncurses*-config, leading to a build
failure as the htop build system would search the path of host tools.
A new patch 0001-Allow-to-override-ncurses-config-path.patch allows this
override [4]. It brings back the need to autoreconf
- set path to ncurses5-config in conf env in order to avoid the htop build
system finding it in the path of host tools
[1] https://github.com/hishamhm/htop/commit/dfad0afb36df9ac104490454c6472625e3ecbe0c
[2] https://github.com/hishamhm/htop/commit/b56195663760d76ea61d9ed15121dd4a13fa68cd
[3] https://github.com/hishamhm/htop/commit/96c929f82b811f054726f1ba3e5fd065976a1204
[4] https://github.com/hishamhm/htop/pull/524/commits/666f12f60f7d7936af932bf513bc0e9c5c5158f9
Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/htop/0001-native-affinity.patch')
| -rw-r--r-- | package/htop/0001-native-affinity.patch | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/package/htop/0001-native-affinity.patch b/package/htop/0001-native-affinity.patch deleted file mode 100644 index bf68e53ed1..0000000000 --- a/package/htop/0001-native-affinity.patch +++ /dev/null @@ -1,25 +0,0 @@ -# This patch removes the check for native_affinity for cross compiling. -# This patch has been pushed to htop on 23 November 2011, however, is -# not in the 1.0 release and may not be exactly what Hisham puts into -# the official build. -# -# Signed-off-by: Andy Kennedy <Andy.Kennedy@adtran.com> -diff -Naur a/configure.ac b/configure.ac ---- a/configure.ac 2011-11-20 20:46:48.000000000 -0600 -+++ b/configure.ac 2011-11-23 10:41:44.000000000 -0600 -@@ -111,7 +111,6 @@ - if test "$cross_compiling" = "no"; then - AC_CHECK_FILE($PROCDIR/stat,,AC_MSG_ERROR(Cannot find /proc/stat. Make sure you have a Linux-compatible /proc filesystem mounted. See the file README for help.)) - AC_CHECK_FILE($PROCDIR/meminfo,,AC_MSG_ERROR(Cannot find /proc/meminfo. Make sure you have a Linux-compatible /proc filesystem mounted. See the file README for help.)) --fi - - AC_ARG_ENABLE(native_affinity, [AC_HELP_STRING([--enable-native-affinity], [enable native sched_setaffinity and sched_getaffinity for affinity support, disables hwloc])], ,enable_native_affinity="yes") - if test "x$enable_native_affinity" = xyes; then -@@ -130,6 +129,7 @@ - AC_MSG_RESULT([yes])], - [AC_MSG_RESULT([no])]) - fi -+fi - - AC_ARG_ENABLE(hwloc, [AC_HELP_STRING([--enable-hwloc], [enable hwloc support for CPU affinity])],, enable_hwloc="no") - if test "x$enable_hwloc" = xyes |
