diff options
author | Hamish Moffatt <hamish@cloud.net.au> | 2008-09-09 02:06:52 +0000 |
---|---|---|
committer | Hamish Moffatt <hamish@cloud.net.au> | 2008-09-09 02:06:52 +0000 |
commit | fc333e7d083d144e0f8d1c4bac061b8de2ee7510 (patch) | |
tree | bd2677cb592626cf9f7e16f3a4b19c864de0d16b /package/procps | |
parent | a94fefa3160fccf7c31b4ec4ef81e5a8bc559ced (diff) |
Support building without WCHAR support
Diffstat (limited to 'package/procps')
-rw-r--r-- | package/procps/Config.in | 1 | ||||
-rw-r--r-- | package/procps/procps-wchar.patch | 29 |
2 files changed, 29 insertions, 1 deletions
diff --git a/package/procps/Config.in b/package/procps/Config.in index 8d45f0acb..48baf7b6a 100644 --- a/package/procps/Config.in +++ b/package/procps/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PROCPS bool "procps" select BR2_PACKAGE_NCURSES - depends on BR2_USE_WCHAR help Standard informational utilities and process-handling tools. Provides things like kill, ps, uptime, free, top, etc... diff --git a/package/procps/procps-wchar.patch b/package/procps/procps-wchar.patch new file mode 100644 index 000000000..791522994 --- /dev/null +++ b/package/procps/procps-wchar.patch @@ -0,0 +1,29 @@ +--- procps-3.2.7/proc/escape.c 2005-01-06 07:50:26.000000000 +1100 ++++ procps-3.2.7.fixed/proc/escape.c 2008-09-09 11:55:57.000000000 +1000 +@@ -15,7 +15,7 @@ + #include "escape.h" + #include "readproc.h" + +-#if (__GNU_LIBRARY__ >= 6) ++#if (__GNU_LIBRARY__ >= 6) && (!defined(__UCLIBC__) || defined(__UCLIBC_HAS_WCHAR__)) + # include <wchar.h> + # include <wctype.h> + # include <stdlib.h> /* MB_CUR_MAX */ +@@ -23,7 +23,7 @@ + # include <langinfo.h> + #endif + +-#if (__GNU_LIBRARY__ >= 6) ++#if (__GNU_LIBRARY__ >= 6) && (!defined(__UCLIBC__) || defined(__UCLIBC_HAS_WCHAR__)) + static int escape_str_utf8(char *restrict dst, const char *restrict src, int bufsize, int *maxcells){ + int my_cells = 0; + int my_bytes = 0; +@@ -123,7 +123,7 @@ + "********************************" + "********************************"; + +-#if (__GNU_LIBRARY__ >= 6) ++#if (__GNU_LIBRARY__ >= 6) && (!defined(__UCLIBC__) || defined(__UCLIBC_HAS_WCHAR__)) + static int utf_init=0; + + if(utf_init==0){ |