* [Buildroot] svn commit: trunk/buildroot/package/procps
@ 2008-08-24 12:40 jacmet at uclibc.org
0 siblings, 0 replies; 4+ messages in thread
From: jacmet at uclibc.org @ 2008-08-24 12:40 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-08-24 05:40:32 -0700 (Sun, 24 Aug 2008)
New Revision: 23194
Log:
procps: needs WCHAR
Modified:
trunk/buildroot/package/procps/Config.in
Changeset:
Modified: trunk/buildroot/package/procps/Config.in
===================================================================
--- trunk/buildroot/package/procps/Config.in 2008-08-24 07:48:22 UTC (rev 23193)
+++ trunk/buildroot/package/procps/Config.in 2008-08-24 12:40:32 UTC (rev 23194)
@@ -1,6 +1,7 @@
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...
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/procps
@ 2008-08-24 12:40 jacmet at uclibc.org
0 siblings, 0 replies; 4+ messages in thread
From: jacmet at uclibc.org @ 2008-08-24 12:40 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-08-24 05:40:36 -0700 (Sun, 24 Aug 2008)
New Revision: 23195
Log:
procps: bump version
Closes #4284.
Removed:
trunk/buildroot/package/procps/procps-mips-define-pagesize.patch
Modified:
trunk/buildroot/package/procps/procps.mk
Changeset:
Deleted: trunk/buildroot/package/procps/procps-mips-define-pagesize.patch
===================================================================
--- trunk/buildroot/package/procps/procps-mips-define-pagesize.patch 2008-08-24 12:40:32 UTC (rev 23194)
+++ trunk/buildroot/package/procps/procps-mips-define-pagesize.patch 2008-08-24 12:40:36 UTC (rev 23195)
@@ -1,29 +0,0 @@
-diff -Naurp procps-3.2.3.orig/minimal.c procps-3.2.3/minimal.c
---- procps-3.2.3.orig/minimal.c 2004-05-04 20:26:14.000000000 -0400
-+++ procps-3.2.3/minimal.c 2004-08-20 02:01:35.868100752 -0400
-@@ -68,8 +68,8 @@
- ///////////////////////////////////////////////////////////
-
- #ifndef PAGE_SIZE
--#warning PAGE_SIZE not defined, assuming it is 4096
--#define PAGE_SIZE 4096
-+#warning PAGE_SIZE not defined, using sysconf() to determine correct value
-+#define PAGE_SIZE (sysconf(_SC_PAGESIZE))
- #endif
-
-
-diff -Naurp procps-3.2.3.orig/ps/common.h procps-3.2.3/ps/common.h
---- procps-3.2.3.orig/ps/common.h 2004-04-25 17:03:18.000000000 -0400
-+++ procps-3.2.3/ps/common.h 2004-08-20 02:00:59.228670792 -0400
-@@ -16,6 +16,11 @@
- #include "../proc/readproc.h"
- #include <asm/page.h> /* looks safe for glibc, we need PAGE_SIZE */
-
-+#ifndef PAGE_SIZE
-+#warning PAGE_SIZE not defined, using sysconf() to determine correct value
-+#define PAGE_SIZE (sysconf(_SC_PAGESIZE))
-+#endif
-+
- #if 0
- #define trace(args...) printf(## args)
- #else
Modified: trunk/buildroot/package/procps/procps.mk
===================================================================
--- trunk/buildroot/package/procps/procps.mk 2008-08-24 12:40:32 UTC (rev 23194)
+++ trunk/buildroot/package/procps/procps.mk 2008-08-24 12:40:36 UTC (rev 23195)
@@ -3,7 +3,7 @@
# procps
#
#############################################################
-PROCPS_VERSION:=3.2.5
+PROCPS_VERSION:=3.2.7
PROCPS_SOURCE:=procps-$(PROCPS_VERSION).tar.gz
PROCPS_SITE:=http://procps.sourceforge.net/
PROCPS_DIR:=$(BUILD_DIR)/procps-$(PROCPS_VERSION)
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/procps
@ 2008-09-09 2:06 hamish at uclibc.org
2008-09-09 7:31 ` Peter Korsgaard
0 siblings, 1 reply; 4+ messages in thread
From: hamish at uclibc.org @ 2008-09-09 2:06 UTC (permalink / raw)
To: buildroot
Author: hamish
Date: 2008-09-08 19:06:52 -0700 (Mon, 08 Sep 2008)
New Revision: 23360
Log:
Support building without WCHAR support
Added:
trunk/buildroot/package/procps/procps-wchar.patch
Modified:
trunk/buildroot/package/procps/Config.in
Changeset:
Modified: trunk/buildroot/package/procps/Config.in
===================================================================
--- trunk/buildroot/package/procps/Config.in 2008-09-08 07:26:12 UTC (rev 23359)
+++ trunk/buildroot/package/procps/Config.in 2008-09-09 02:06:52 UTC (rev 23360)
@@ -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...
Added: trunk/buildroot/package/procps/procps-wchar.patch
===================================================================
--- trunk/buildroot/package/procps/procps-wchar.patch (rev 0)
+++ trunk/buildroot/package/procps/procps-wchar.patch 2008-09-09 02:06:52 UTC (rev 23360)
@@ -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){
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/procps
2008-09-09 2:06 hamish at uclibc.org
@ 2008-09-09 7:31 ` Peter Korsgaard
0 siblings, 0 replies; 4+ messages in thread
From: Peter Korsgaard @ 2008-09-09 7:31 UTC (permalink / raw)
To: buildroot
>>>>> "hamish" == hamish <hamish@uclibc.org> writes:
hamish> Author: hamish
hamish> Date: 2008-09-08 19:06:52 -0700 (Mon, 08 Sep 2008)
hamish> New Revision: 23360
hamish> Log:
hamish> Support building without WCHAR support
Thanks, don't forget to push this patch upstream.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2008-09-09 7:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-24 12:40 [Buildroot] svn commit: trunk/buildroot/package/procps jacmet at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2008-08-24 12:40 jacmet at uclibc.org
2008-09-09 2:06 hamish at uclibc.org
2008-09-09 7:31 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox