r1896 - in glibc-package/branches/glibc-2.5/debian: . patches patches/any
Author: aurel32
Date: 2007-01-08 12:23:30 +0100 (Mon, 08 Jan 2007)
New Revision: 1896
Added:
glibc-package/branches/glibc-2.5/debian/patches/any/local-linuxthreads-semaphore_h.diff
Modified:
glibc-package/branches/glibc-2.5/debian/changelog
glibc-package/branches/glibc-2.5/debian/patches/series
Log:
* debian/any/patches/local-linuxthreads-semaphore_h.diff: new patch (fix
/usr/include/semaphore.h with linuxthreads).
Modified: glibc-package/branches/glibc-2.5/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.5/debian/changelog 2007-01-08 02:06:39 UTC (rev 1895)
+++ glibc-package/branches/glibc-2.5/debian/changelog 2007-01-08 11:23:30 UTC (rev 1896)
@@ -62,6 +62,8 @@
thread-local variables on powerpc) from CVS.
* Build depends on binutils (>= 2.17.50) to enable --hash-style linking
(closes: bug#405738).
+ * debian/any/patches/local-linuxthreads-semaphore_h.diff: new patch (fix
+ /usr/include/semaphore.h with linuxthreads).
[ Denis Barbier ]
* Remove localedata/locale-en_NZ.diff (merged upstream).
@@ -81,7 +83,7 @@
* Update localedata/fix-lang.diff
* Update localedata/first_weekday.diff
- -- Aurelien Jarno <aurel32@debian.org> Sun, 5 Nov 2006 21:50:19 +0100
+ -- Aurelien Jarno <aurel32@debian.org> Mon, 8 Jan 2007 12:08:02 +0100
glibc (2.4-1) UNRELEASED; urgency=low
Added: glibc-package/branches/glibc-2.5/debian/patches/any/local-linuxthreads-semaphore_h.diff
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/any/local-linuxthreads-semaphore_h.diff 2007-01-08 02:06:39 UTC (rev 1895)
+++ glibc-package/branches/glibc-2.5/debian/patches/any/local-linuxthreads-semaphore_h.diff 2007-01-08 11:23:30 UTC (rev 1896)
@@ -0,0 +1,181 @@
+--- glibc-2.5.orig/linuxthreads/semaphore.h 2004-04-18 01:01:39.000000000 +0200
++++ glibc-2.5/linuxthreads/semaphore.h 2007-01-05 02:44:21.677153107 +0100
+@@ -1,87 +0,0 @@
+-/* Linuxthreads - a simple clone()-based implementation of Posix */
+-/* threads for Linux. */
+-/* Copyright (C) 1996 Xavier Leroy (Xavier.Leroy@inria.fr) */
+-/* */
+-/* This program is free software; you can redistribute it and/or */
+-/* modify it under the terms of the GNU Library General Public License */
+-/* as published by the Free Software Foundation; either version 2 */
+-/* of the License, or (at your option) any later version. */
+-/* */
+-/* This program is distributed in the hope that it will be useful, */
+-/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
+-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
+-/* GNU Library General Public License for more details. */
+-
+-#ifndef _SEMAPHORE_H
+-#define _SEMAPHORE_H 1
+-
+-#include <features.h>
+-#include <sys/types.h>
+-#ifdef __USE_XOPEN2K
+-# define __need_timespec
+-# include <time.h>
+-#endif
+-
+-#ifndef _PTHREAD_DESCR_DEFINED
+-/* Thread descriptors. Needed for `sem_t' definition. */
+-typedef struct _pthread_descr_struct *_pthread_descr;
+-# define _PTHREAD_DESCR_DEFINED
+-#endif
+-
+-/* System specific semaphore definition. */
+-typedef struct
+-{
+- struct _pthread_fastlock __sem_lock;
+- int __sem_value;
+- _pthread_descr __sem_waiting;
+-} sem_t;
+-
+-
+-
+-/* Value returned if `sem_open' failed. */
+-#define SEM_FAILED ((sem_t *) 0)
+-
+-/* Maximum value the semaphore can have. */
+-#define SEM_VALUE_MAX (2147483647)
+-
+-
+-__BEGIN_DECLS
+-
+-/* Initialize semaphore object SEM to VALUE. If PSHARED then share it
+- with other processes. */
+-extern int sem_init (sem_t *__sem, int __pshared, unsigned int __value) __THROW;
+-
+-/* Free resources associated with semaphore object SEM. */
+-extern int sem_destroy (sem_t *__sem) __THROW;
+-
+-/* Open a named semaphore NAME with open flaot OFLAG. */
+-extern sem_t *sem_open (__const char *__name, int __oflag, ...) __THROW;
+-
+-/* Close descriptor for named semaphore SEM. */
+-extern int sem_close (sem_t *__sem) __THROW;
+-
+-/* Remove named semaphore NAME. */
+-extern int sem_unlink (__const char *__name) __THROW;
+-
+-/* Wait for SEM being posted. */
+-extern int sem_wait (sem_t *__sem);
+-
+-#ifdef __USE_XOPEN2K
+-/* Similar to `sem_wait' but wait only until ABSTIME. */
+-extern int sem_timedwait (sem_t *__restrict __sem,
+- __const struct timespec *__restrict __abstime);
+-#endif
+-
+-/* Test whether SEM is posted. */
+-extern int sem_trywait (sem_t *__sem) __THROW;
+-
+-/* Post SEM. */
+-extern int sem_post (sem_t *__sem) __THROW;
+-
+-/* Get current value of SEM and store it in *SVAL. */
+-extern int sem_getvalue (sem_t *__restrict __sem, int *__restrict __sval)
+- __THROW;
+-
+-__END_DECLS
+-
+-#endif /* semaphore.h */
+--- glibc-2.5.orig/linuxthreads/sysdeps/pthread/semaphore.h 1998-09-07 01:40:57.000000000 +0200
++++ glibc-2.5.orig/linuxthreads/sysdeps/pthread/semaphore.h 2004-04-18 01:01:39.000000000 +0200
+@@ -1 +1,87 @@
+-#include <linuxthreads/semaphore.h>
++/* Linuxthreads - a simple clone()-based implementation of Posix */
++/* threads for Linux. */
++/* Copyright (C) 1996 Xavier Leroy (Xavier.Leroy@inria.fr) */
++/* */
++/* This program is free software; you can redistribute it and/or */
++/* modify it under the terms of the GNU Library General Public License */
++/* as published by the Free Software Foundation; either version 2 */
++/* of the License, or (at your option) any later version. */
++/* */
++/* This program is distributed in the hope that it will be useful, */
++/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
++/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
++/* GNU Library General Public License for more details. */
++
++#ifndef _SEMAPHORE_H
++#define _SEMAPHORE_H 1
++
++#include <features.h>
++#include <sys/types.h>
++#ifdef __USE_XOPEN2K
++# define __need_timespec
++# include <time.h>
++#endif
++
++#ifndef _PTHREAD_DESCR_DEFINED
++/* Thread descriptors. Needed for `sem_t' definition. */
++typedef struct _pthread_descr_struct *_pthread_descr;
++# define _PTHREAD_DESCR_DEFINED
++#endif
++
++/* System specific semaphore definition. */
++typedef struct
++{
++ struct _pthread_fastlock __sem_lock;
++ int __sem_value;
++ _pthread_descr __sem_waiting;
++} sem_t;
++
++
++
++/* Value returned if `sem_open' failed. */
++#define SEM_FAILED ((sem_t *) 0)
++
++/* Maximum value the semaphore can have. */
++#define SEM_VALUE_MAX (2147483647)
++
++
++__BEGIN_DECLS
++
++/* Initialize semaphore object SEM to VALUE. If PSHARED then share it
++ with other processes. */
++extern int sem_init (sem_t *__sem, int __pshared, unsigned int __value) __THROW;
++
++/* Free resources associated with semaphore object SEM. */
++extern int sem_destroy (sem_t *__sem) __THROW;
++
++/* Open a named semaphore NAME with open flaot OFLAG. */
++extern sem_t *sem_open (__const char *__name, int __oflag, ...) __THROW;
++
++/* Close descriptor for named semaphore SEM. */
++extern int sem_close (sem_t *__sem) __THROW;
++
++/* Remove named semaphore NAME. */
++extern int sem_unlink (__const char *__name) __THROW;
++
++/* Wait for SEM being posted. */
++extern int sem_wait (sem_t *__sem);
++
++#ifdef __USE_XOPEN2K
++/* Similar to `sem_wait' but wait only until ABSTIME. */
++extern int sem_timedwait (sem_t *__restrict __sem,
++ __const struct timespec *__restrict __abstime);
++#endif
++
++/* Test whether SEM is posted. */
++extern int sem_trywait (sem_t *__sem) __THROW;
++
++/* Post SEM. */
++extern int sem_post (sem_t *__sem) __THROW;
++
++/* Get current value of SEM and store it in *SVAL. */
++extern int sem_getvalue (sem_t *__restrict __sem, int *__restrict __sval)
++ __THROW;
++
++__END_DECLS
++
++#endif /* semaphore.h */
Modified: glibc-package/branches/glibc-2.5/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/series 2007-01-08 02:06:39 UTC (rev 1895)
+++ glibc-package/branches/glibc-2.5/debian/patches/series 2007-01-08 11:23:30 UTC (rev 1896)
@@ -104,6 +104,7 @@
any/local-ldconfig.diff -p0
any/local-libgcc-compat-main.diff -p0
any/local-libgcc-compat-ports.diff -p0
+any/local-linuxthreads-semaphore_h.diff -p1
any/local-linuxthreads-tst-sighandler.diff -p1
any/local-localedef-fix-trampoline.diff -p1
any/local-makeconfig.diff -p0
Reply to: