r3504 - in glibc-package/branches/eglibc-2.10/debian: . patches patches/alpha
Author: aurel32
Date: 2009-05-16 14:08:14 +0000 (Sat, 16 May 2009)
New Revision: 3504
Added:
glibc-package/branches/eglibc-2.10/debian/patches/alpha/submitted-getsysstats.diff
Modified:
glibc-package/branches/eglibc-2.10/debian/changelog
glibc-package/branches/eglibc-2.10/debian/patches/series
Log:
* Add debian/patches/alpha/submitted-getsysstats.diff to partially fix
FTBFS on alpha.
Modified: glibc-package/branches/eglibc-2.10/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/changelog 2009-05-16 11:25:04 UTC (rev 3503)
+++ glibc-package/branches/eglibc-2.10/debian/changelog 2009-05-16 14:08:14 UTC (rev 3504)
@@ -68,6 +68,8 @@
* Remove debian/patches/powerpc/local-sysconf.diff, as it only concerns
kernel that are not supported anymore.
* Add debian/patches/ia64/submitted-sysconf.diff to fix sysconf() on ia64.
+ * Add debian/patches/alpha/submitted-getsysstats.diff to partially fix
+ FTBFS on alpha.
-- Aurelien Jarno <aurel32@debian.org> Sun, 10 May 2009 15:03:39 +0200
Added: glibc-package/branches/eglibc-2.10/debian/patches/alpha/submitted-getsysstats.diff
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/patches/alpha/submitted-getsysstats.diff (rev 0)
+++ glibc-package/branches/eglibc-2.10/debian/patches/alpha/submitted-getsysstats.diff 2009-05-16 14:08:14 UTC (rev 3504)
@@ -0,0 +1,27 @@
+2009-05-16 Aurelien Jarno <aurelien@aurel32.net>
+
+ * sysdeps/unix/sysv/linux/alpha/getsysstats.c (GET_NPROCS_PARSER):
+ Change parameters and use next_line.
+
+--- a/sysdeps/unix/sysv/linux/alpha/getsysstats.c
++++ b/sysdeps/unix/sysv/linux/alpha/getsysstats.c
+@@ -20,15 +20,16 @@
+
+
+ /* We need to define a special parser for /proc/cpuinfo. */
+-#define GET_NPROCS_PARSER(FP, BUFFER, RESULT) \
++#define GET_NPROCS_PARSER(FD, BUFFER, CP, RE, BUFFER_END, RESULT) \
+ do \
+ { \
+ /* Find the line that contains the information about the number of \
+ active cpus. We don't have to fear extremely long lines since \
+ the kernel will not generate them. 8192 bytes are really enough. \
+ If there is no "CPUs ..." line then we are on a UP system. */ \
++ char *l; \
+ (RESULT) = 1; \
+- while (fgets_unlocked (BUFFER, sizeof (BUFFER), FP) != NULL) \
++ while ((l = next_line (FD, BUFFER, &CP, &RE, BUFFER_END)) != NULL) \
+ if ((sscanf (BUFFER, "cpus active : %d", &(RESULT)) == 1) \
+ || (sscanf (BUFFER, "CPUs probed %*d active %d", \
+ &(RESULT)) == 1)) \
+
Modified: glibc-package/branches/eglibc-2.10/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/patches/series 2009-05-16 11:25:04 UTC (rev 3503)
+++ glibc-package/branches/eglibc-2.10/debian/patches/series 2009-05-16 14:08:14 UTC (rev 3504)
@@ -43,6 +43,7 @@
alpha/submitted-dl-support.diff
alpha/submitted-fdatasync.diff
alpha/submitted-fpu-round.diff
+alpha/submitted-getsysstats.diff
alpha/submitted-PTR_MANGLE.diff
alpha/submitted-procfs_h.diff
Reply to: