Pārlūkot izejas kodu

Support building without WCHAR support

Hamish Moffatt 17 gadi atpakaļ
vecāks
revīzija
fc333e7d08
2 mainītis faili ar 29 papildinājumiem un 1 dzēšanām
  1. 0 1
      package/procps/Config.in
  2. 29 0
      package/procps/procps-wchar.patch

+ 0 - 1
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...

+ 29 - 0
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){