Author: sthibault Date: 2015-09-01 00:26:53 +0000 (Tue, 01 Sep 2015) New Revision: 6515
Modified: glibc-package/branches/glibc-2.21/debian/changelog glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/unsubmitted-libpthread-semaphore.h.diff Log: patches/hurd-i386/unsubmitted-libpthread-semaphore.h.diff: Remove libpthread/sysdeps/i386/bits/semaphore.h, now that hurd Implies libpthread/sysdeps/generic. Move libpthread/include/semaphore.h into libpthread/sysdeps/pthread/semaphore.h instead of the latter just including the former, since the latter is what gets installed. Modified: glibc-package/branches/glibc-2.21/debian/changelog =================================================================== --- glibc-package/branches/glibc-2.21/debian/changelog 2015-08-30 16:34:06 UTC (rev 6514) +++ glibc-package/branches/glibc-2.21/debian/changelog 2015-09-01 00:26:53 UTC (rev 6515) @@ -6,6 +6,11 @@ around the issue. Also take the opportunity of the upstream version bump to bump the versions to GLIBC_2_21, which will allow to remove the _DEBIAN_ hacks once packages are rebuilt. + * patches/hurd-i386/unsubmitted-libpthread-semaphore.h.diff: Remove + libpthread/sysdeps/i386/bits/semaphore.h, now that hurd Implies + libpthread/sysdeps/generic. Move libpthread/include/semaphore.h into + libpthread/sysdeps/pthread/semaphore.h instead of the latter just + including the former, since the latter is what gets installed. -- Aurelien Jarno <aure...@debian.org> Sat, 29 Aug 2015 00:43:44 +0200 Modified: glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/unsubmitted-libpthread-semaphore.h.diff =================================================================== --- glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/unsubmitted-libpthread-semaphore.h.diff 2015-08-30 16:34:06 UTC (rev 6514) +++ glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/unsubmitted-libpthread-semaphore.h.diff 2015-09-01 00:26:53 UTC (rev 6515) @@ -1,12 +1,154 @@ -Index: glibc/libpthread/sysdeps/i386/bits/semaphore.h +#Index: glibc-2.21/libpthread/sysdeps/i386/bits/semaphore.h +#=================================================================== +#--- /dev/null +#+++ glibc-2.21/libpthread/sysdeps/i386/bits/semaphore.h +#@@ -0,0 +1 @@ +#+#include "../../generic/bits/semaphore.h" +Index: glibc-2.21/libpthread/include/semaphore.h =================================================================== ---- /dev/null -+++ glibc/libpthread/sysdeps/i386/bits/semaphore.h -@@ -0,0 +1 @@ -+#include "../../generic/bits/semaphore.h" -Index: glibc/libpthread/sysdeps/pthread/semaphore.h +--- glibc-2.21.orig/libpthread/include/semaphore.h ++++ /dev/null +@@ -1,69 +0,0 @@ +-/* Copyright (C) 2005, 2007 Free Software Foundation, Inc. +- This file is part of the GNU C Library. +- +- The GNU C Library 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. +- +- The GNU C Library 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. +- +- You should have received a copy of the GNU Library General Public +- License along with the GNU C Library; see the file COPYING.LIB. If not, +- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +- Boston, MA 02111-1307, USA. */ +- +-#ifndef _SEMAPHORE_H +-#define _SEMAPHORE_H 1 +- +-#include <features.h> +- +-__BEGIN_DECLS +- +-#include <bits/semaphore.h> +- +-#define SEM_FAILED ((void *) 0) +- +-typedef struct __semaphore sem_t; +- +-/* Initialize semaphore *SEM with value VALUE. */ +-extern int sem_init (sem_t *sem, int pshared, unsigned value); +- +-/* Destroy semaphore *SEM created with sem_init. */ +-extern int sem_destroy (sem_t *sem); +- +-/* Store the value of semaphore *SEM in *VALUE. */ +-extern int sem_getvalue (sem_t *__restrict sem, int *__restrict value); +- +-/* Perform a down operation on semaphore *SEM. */ +-extern int sem_wait (sem_t *sem); +- +-/* Perform a down operation on semaphore *SEM if it can be done so +- without blocking. */ +-extern int sem_trywait (sem_t *sem); +- +-#ifdef __USE_XOPEN2K +-/* Perform a down operation on semaphore *SEM but don't wait longer +- than TIMEOUT. */ +-extern int sem_timedwait (sem_t *__restrict sem, +- const struct timespec *__restrict timeout); +-#endif +- +-/* Perform an up operation on semaphore *SEM. */ +-extern int sem_post (sem_t *sem); +- +-/* Open a named semaphore. */ +-extern sem_t *sem_open (const char *name, int open_flags, ...); +- +-/* Close a semaphore returned by sem_open. */ +-extern int sem_close (sem_t *sem); +- +-/* Unlink a named semaphore. */ +-extern int sem_unlink (const char *name); +- +-__END_DECLS +- +-#endif /* semaphore.h */ +Index: glibc-2.21/libpthread/sysdeps/pthread/semaphore.h =================================================================== --- /dev/null -+++ glibc/libpthread/sysdeps/pthread/semaphore.h -@@ -0,0 +1 @@ -+#include "../../include/semaphore.h" ++++ glibc-2.21/libpthread/sysdeps/pthread/semaphore.h +@@ -0,0 +1,69 @@ ++/* Copyright (C) 2005, 2007 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library 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. ++ ++ The GNU C Library 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. ++ ++ You should have received a copy of the GNU Library General Public ++ License along with the GNU C Library; see the file COPYING.LIB. If not, ++ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, ++ Boston, MA 02111-1307, USA. */ ++ ++#ifndef _SEMAPHORE_H ++#define _SEMAPHORE_H 1 ++ ++#include <features.h> ++ ++__BEGIN_DECLS ++ ++#include <bits/semaphore.h> ++ ++#define SEM_FAILED ((void *) 0) ++ ++typedef struct __semaphore sem_t; ++ ++/* Initialize semaphore *SEM with value VALUE. */ ++extern int sem_init (sem_t *sem, int pshared, unsigned value); ++ ++/* Destroy semaphore *SEM created with sem_init. */ ++extern int sem_destroy (sem_t *sem); ++ ++/* Store the value of semaphore *SEM in *VALUE. */ ++extern int sem_getvalue (sem_t *__restrict sem, int *__restrict value); ++ ++/* Perform a down operation on semaphore *SEM. */ ++extern int sem_wait (sem_t *sem); ++ ++/* Perform a down operation on semaphore *SEM if it can be done so ++ without blocking. */ ++extern int sem_trywait (sem_t *sem); ++ ++#ifdef __USE_XOPEN2K ++/* Perform a down operation on semaphore *SEM but don't wait longer ++ than TIMEOUT. */ ++extern int sem_timedwait (sem_t *__restrict sem, ++ const struct timespec *__restrict timeout); ++#endif ++ ++/* Perform an up operation on semaphore *SEM. */ ++extern int sem_post (sem_t *sem); ++ ++/* Open a named semaphore. */ ++extern sem_t *sem_open (const char *name, int open_flags, ...); ++ ++/* Close a semaphore returned by sem_open. */ ++extern int sem_close (sem_t *sem); ++ ++/* Unlink a named semaphore. */ ++extern int sem_unlink (const char *name); ++ ++__END_DECLS ++ ++#endif /* semaphore.h */