Author: aurel32
Date: 2010-02-08 22:32:56 +0000 (Mon, 08 Feb 2010)
New Revision: 4164

Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
Log:
  * kfreebsd/local-sysdeps.diff: update to revision 2974 (from glibc-bsd).



Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog        2010-02-08 22:06:29 UTC (rev 
4163)
+++ glibc-package/trunk/debian/changelog        2010-02-08 22:32:56 UTC (rev 
4164)
@@ -8,6 +8,7 @@
   * debian/*symbols*: simplify symbol files by using the new #PACKAGE#
     feature.
   * Bump to Standards-Version 3.8.4.
+  * kfreebsd/local-sysdeps.diff: update to revision 2974 (from glibc-bsd).
 
  -- Aurelien Jarno <aure...@debian.org>  Mon, 08 Feb 2010 19:20:38 +0100
 

Modified: glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff      
2010-02-08 22:06:29 UTC (rev 4163)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff      
2010-02-08 22:32:56 UTC (rev 4164)
@@ -23443,7 +23443,7 @@
 +readlink              -       readlink                i:spi           
__syscall_readlink __readlink readlink
 --- /dev/null
 +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/sysconf.c
-@@ -0,0 +1,50 @@
+@@ -0,0 +1,69 @@
 +/* Get file-specific information about a file.
 +   Copyright (C) 2006 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -23470,6 +23470,7 @@
 +#include <time.h>
 +#include <unistd.h>
 +#include <hp-timing.h>
++#include <sys/sysctl.h>
 +
 +static long int posix_sysconf (int name);
 +
@@ -23477,15 +23478,33 @@
 +long int
 +__sysconf (int name)
 +{
-+  if (name == _SC_CPUTIME || name == _SC_THREAD_CPUTIME)
++  int request[2];
++  int value;
++  size_t len = sizeof(value);
++
++  switch(name)
 +    {
++      case _SC_CPUTIME:
++      case _SC_THREAD_CPUTIME:
 +#if HP_TIMING_AVAIL
-+      // XXX We can add  here test for machines which cannot support a
-+      // XXX usable TSC.
-+      return 200809L;
++      // XXX We can add  here test for machines which cannot support a
++      // XXX usable TSC.
++      return 200809L;
 +#else
-+      return -1;
++      return -1;
 +#endif
++      case _SC_NGROUPS_MAX:
++      request[0] = CTL_KERN;
++      request[1] = KERN_NGROUPS;
++      if (sysctl(request, 2, &value, &len, NULL, 0) == -1)
++          return NGROUPS_MAX;
++      return (long)value;
++      case _SC_ARG_MAX:
++      request[0] = CTL_KERN;
++      request[1] = KERN_ARGMAX;
++      if (sysctl(request, 2, &value, &len, NULL, 0) == -1)
++          return ARG_MAX;
++      return (long)value;
 +    }
 +  return posix_sysconf (name);
 +}


-- 
To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to