r6486 - in glibc-package/branches/glibc-2.21/debian: . patches patches/hurd-i386
Author: sthibault
Date: 2015-08-27 19:39:51 + (Thu, 27 Aug 2015)
New Revision: 6486
Added:
glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/cvs-libpthread_build.diff
glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/cvs-libpthread_clean2.diff
Modified:
glibc-package/branches/glibc-2.21/debian/changelog
glibc-package/branches/glibc-2.21/debian/patches/series
Log:
backport r6485 from trunk
* patches/hurd-i386/cvs-libpthread_clean2.diff: New patch to drop spurious
code getting in the way for stage1.
* patches/hurd-i386/cvs-libpthread_build.diff: New patch to fix build of
generic libpthread code.
Modified: glibc-package/branches/glibc-2.21/debian/changelog
===
--- glibc-package/branches/glibc-2.21/debian/changelog 2015-08-27 19:39:11 UTC
(rev 6485)
+++ glibc-package/branches/glibc-2.21/debian/changelog 2015-08-27 19:39:51 UTC
(rev 6486)
@@ -231,6 +231,10 @@
* sysdeps/hurd-i386.mk: Fix stage1 about xen packages for hurd-i386 too.
* patches/hurd-i386/tg-sysheaders.diff: New patch to fix stage1 finding hurd
headers.
+ * patches/hurd-i386/cvs-libpthread_clean2.diff: New patch to drop spurious
+code getting in the way for stage1.
+ * patches/hurd-i386/cvs-libpthread_build.diff: New patch to fix build of
+generic libpthread code.
-- Samuel Thibault sthiba...@debian.org Sun, 09 Aug 2015 20:00:16 +
Copied:
glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/cvs-libpthread_build.diff
(from rev 6485,
glibc-package/trunk/debian/patches/hurd-i386/cvs-libpthread_build.diff)
===
---
glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/cvs-libpthread_build.diff
(rev 0)
+++
glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/cvs-libpthread_build.diff
2015-08-27 19:39:51 UTC (rev 6486)
@@ -0,0 +1,54 @@
+commit 75b1f41bac0b70d9f87fbafde7cb94b9da3607c1
+Author: Samuel Thibault samuel.thiba...@ens-lyon.org
+Date: Thu Aug 20 23:30:14 2015 +0200
+
+Fix raise.c build
+
+* sysdeps/generic/raise.c: Include pthread.h instead of non-existing
+sig-internal.h
+
+commit 42889b484ae0cae466a63e13e25a117094732e75
+Author: Samuel Thibault samuel.thiba...@ens-lyon.org
+Date: Thu Aug 20 23:50:47 2015 +0200
+
+Drop debugging statements
+
+* sysdeps/generic/raise.c (raise): Do not call debug.
+
+commit 8ffa76b6e9af0df8531278f15aa6301b1b5ba76f
+Author: Samuel Thibault samuel.thiba...@ens-lyon.org
+Date: Thu Aug 20 23:57:54 2015 +0200
+
+Fix raise thread-aware implementation
+
+* sysdeps/generic/raise.c (pthread_kill): Make ref weak.
+(raise): Only call pthread_kill when it is not NULL. Call kill otherwise.
+
+--- a/libpthread/sysdeps/generic/raise.c
b/libpthread/sysdeps/generic/raise.c
+@@ -18,8 +18,9 @@
+License along with this program. If not, see
+http://www.gnu.org/licenses/. */
+
+-#include sig-internal.h
++#include pthread.h
+
++#pragma weak pthread_kill
+ int
+ raise (int signo)
+ {
+@@ -27,9 +28,11 @@ raise (int signo)
+ the effect of the raise() function shall be equivalent to
+ calling: pthread_kill(pthread_self(), sig); */
+
+-debug (0, );
+- int err = pthread_kill (pthread_self (), signo);
+-debug (0, );
++ int err;
++ if (pthread_kill)
++err = pthread_kill (pthread_self (), signo);
++ else
++err = __kill (__getpid (), signo);
+ if (err)
+ {
+ errno = err;
Copied:
glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/cvs-libpthread_clean2.diff
(from rev 6485,
glibc-package/trunk/debian/patches/hurd-i386/cvs-libpthread_clean2.diff)
===
---
glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/cvs-libpthread_clean2.diff
(rev 0)
+++
glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/cvs-libpthread_clean2.diff
2015-08-27 19:39:51 UTC (rev 6486)
@@ -0,0 +1,375 @@
+commit 47916b2fb311a305ba31715c1e67462c7f2e1821
+Author: Samuel Thibault samuel.thiba...@ens-lyon.org
+Date: Thu Aug 20 23:27:46 2015 +0200
+
+Remove more unused signals implementation
+
+* sysdeps/generic/killpg.c: Remove file.
+* sysdeps/generic/sigaddset.c: Likewise.
+* sysdeps/generic/sigdelset.c: Likewise.
+* sysdeps/generic/sigemptyset.c: Likewise.
+* sysdeps/generic/sigfillset.c: Likewise.
+* sysdeps/generic/siginterrupt.c: Likewise.
+* sysdeps/generic/sigismember.c: Likewise.
+* sysdeps/generic/signal.c: Likewise.
+* sysdeps/generic/sigwait.c: Likewise.
+
+diff --git a/libpthread/sysdeps/generic/killpg.c
b/libpthread/sysdeps/generic/killpg.c
+deleted file mode 100644
+index 7f7ed87..000
+--- a/libpthread/sysdeps/generic/killpg.c
/dev/null
+@@ -1,27 +0,0 @@
+-/* killpg.c - Generic killpg implementation.
+-
r6485 - in glibc-package/trunk/debian: . patches patches/hurd-i386
Author: sthibault
Date: 2015-08-27 19:39:11 + (Thu, 27 Aug 2015)
New Revision: 6485
Added:
glibc-package/trunk/debian/patches/hurd-i386/cvs-libpthread_build.diff
glibc-package/trunk/debian/patches/hurd-i386/cvs-libpthread_clean2.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* patches/hurd-i386/cvs-libpthread_clean2.diff: New patch to drop spurious
code getting in the way for stage1.
* patches/hurd-i386/cvs-libpthread_build.diff: New patch to fix build of
generic libpthread code.
Modified: glibc-package/trunk/debian/changelog
===
--- glibc-package/trunk/debian/changelog2015-08-27 08:15:00 UTC (rev
6484)
+++ glibc-package/trunk/debian/changelog2015-08-27 19:39:11 UTC (rev
6485)
@@ -6,6 +6,10 @@
* sysdeps/hurd-i386.mk: Fix stage1 about xen packages for hurd-i386 too.
* patches/hurd-i386/tg-sysheaders.diff: New patch to fix stage1 finding hurd
headers.
+ * patches/hurd-i386/cvs-libpthread_clean2.diff: New patch to drop spurious
+code getting in the way for stage1.
+ * patches/hurd-i386/cvs-libpthread_build.diff: New patch to fix build of
+generic libpthread code.
-- Samuel Thibault sthiba...@debian.org Sun, 09 Aug 2015 20:00:16 +
Added: glibc-package/trunk/debian/patches/hurd-i386/cvs-libpthread_build.diff
===
--- glibc-package/trunk/debian/patches/hurd-i386/cvs-libpthread_build.diff
(rev 0)
+++ glibc-package/trunk/debian/patches/hurd-i386/cvs-libpthread_build.diff
2015-08-27 19:39:11 UTC (rev 6485)
@@ -0,0 +1,54 @@
+commit 75b1f41bac0b70d9f87fbafde7cb94b9da3607c1
+Author: Samuel Thibault samuel.thiba...@ens-lyon.org
+Date: Thu Aug 20 23:30:14 2015 +0200
+
+Fix raise.c build
+
+* sysdeps/generic/raise.c: Include pthread.h instead of non-existing
+sig-internal.h
+
+commit 42889b484ae0cae466a63e13e25a117094732e75
+Author: Samuel Thibault samuel.thiba...@ens-lyon.org
+Date: Thu Aug 20 23:50:47 2015 +0200
+
+Drop debugging statements
+
+* sysdeps/generic/raise.c (raise): Do not call debug.
+
+commit 8ffa76b6e9af0df8531278f15aa6301b1b5ba76f
+Author: Samuel Thibault samuel.thiba...@ens-lyon.org
+Date: Thu Aug 20 23:57:54 2015 +0200
+
+Fix raise thread-aware implementation
+
+* sysdeps/generic/raise.c (pthread_kill): Make ref weak.
+(raise): Only call pthread_kill when it is not NULL. Call kill otherwise.
+
+--- a/libpthread/sysdeps/generic/raise.c
b/libpthread/sysdeps/generic/raise.c
+@@ -18,8 +18,9 @@
+License along with this program. If not, see
+http://www.gnu.org/licenses/. */
+
+-#include sig-internal.h
++#include pthread.h
+
++#pragma weak pthread_kill
+ int
+ raise (int signo)
+ {
+@@ -27,9 +28,11 @@ raise (int signo)
+ the effect of the raise() function shall be equivalent to
+ calling: pthread_kill(pthread_self(), sig); */
+
+-debug (0, );
+- int err = pthread_kill (pthread_self (), signo);
+-debug (0, );
++ int err;
++ if (pthread_kill)
++err = pthread_kill (pthread_self (), signo);
++ else
++err = __kill (__getpid (), signo);
+ if (err)
+ {
+ errno = err;
Added: glibc-package/trunk/debian/patches/hurd-i386/cvs-libpthread_clean2.diff
===
--- glibc-package/trunk/debian/patches/hurd-i386/cvs-libpthread_clean2.diff
(rev 0)
+++ glibc-package/trunk/debian/patches/hurd-i386/cvs-libpthread_clean2.diff
2015-08-27 19:39:11 UTC (rev 6485)
@@ -0,0 +1,375 @@
+commit 47916b2fb311a305ba31715c1e67462c7f2e1821
+Author: Samuel Thibault samuel.thiba...@ens-lyon.org
+Date: Thu Aug 20 23:27:46 2015 +0200
+
+Remove more unused signals implementation
+
+* sysdeps/generic/killpg.c: Remove file.
+* sysdeps/generic/sigaddset.c: Likewise.
+* sysdeps/generic/sigdelset.c: Likewise.
+* sysdeps/generic/sigemptyset.c: Likewise.
+* sysdeps/generic/sigfillset.c: Likewise.
+* sysdeps/generic/siginterrupt.c: Likewise.
+* sysdeps/generic/sigismember.c: Likewise.
+* sysdeps/generic/signal.c: Likewise.
+* sysdeps/generic/sigwait.c: Likewise.
+
+diff --git a/libpthread/sysdeps/generic/killpg.c
b/libpthread/sysdeps/generic/killpg.c
+deleted file mode 100644
+index 7f7ed87..000
+--- a/libpthread/sysdeps/generic/killpg.c
/dev/null
+@@ -1,27 +0,0 @@
+-/* killpg.c - Generic killpg implementation.
+- Copyright (C) 2008 Free Software Foundation, Inc.
+- Written by Neal H. Walfield n...@gnu.org.
+-
+- This file is part of the GNU Hurd.
+-
+- The GNU Hurd is free software; you can redistribute it and/or
+- modify it under the terms of the GNU Lesser General Public License
+- as published by the Free Software Foundation; either version 3 of
+- the License, or (at your option) any later version.
+-
+-
Bug#797093: glibc: New upstream version 2.22 available
Source: glibc Severity: wishlist glibc 2.22 was released Aug 14: https://www.sourceware.org/ml/libc-alpha/2015-08/msg00609.html It would be nice to have this version packaged, at least in experimental. -- Daniel
r6488 - glibc-package/branches/glibc-2.21/debian/patches/hurd-i386
Author: sthibault
Date: 2015-08-28 01:11:29 + (Fri, 28 Aug 2015)
New Revision: 6488
Modified:
glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/cvs-libpthread_build.diff
Log:
port r6487 from trunk: hurd-i386: Fix spurious dependency of libc on libpthread
Modified:
glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/cvs-libpthread_build.diff
===
---
glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/cvs-libpthread_build.diff
2015-08-28 01:11:03 UTC (rev 6487)
+++
glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/cvs-libpthread_build.diff
2015-08-28 01:11:29 UTC (rev 6488)
@@ -26,7 +26,7 @@
--- a/libpthread/sysdeps/generic/raise.c
+++ b/libpthread/sysdeps/generic/raise.c
-@@ -18,8 +18,9 @@
+@@ -18,8 +18,10 @@
License along with this program. If not, see
http://www.gnu.org/licenses/. */
@@ -34,6 +34,7 @@
+#include pthread.h
+#pragma weak pthread_kill
++#pragma weak pthread_self
int
raise (int signo)
{
r6487 - glibc-package/trunk/debian/patches/hurd-i386
Author: sthibault
Date: 2015-08-28 01:11:03 + (Fri, 28 Aug 2015)
New Revision: 6487
Modified:
glibc-package/trunk/debian/patches/hurd-i386/cvs-libpthread_build.diff
Log:
hurd-i386: Fix spurious dependency of libc on libpthread
Modified: glibc-package/trunk/debian/patches/hurd-i386/cvs-libpthread_build.diff
===
--- glibc-package/trunk/debian/patches/hurd-i386/cvs-libpthread_build.diff
2015-08-27 19:39:51 UTC (rev 6486)
+++ glibc-package/trunk/debian/patches/hurd-i386/cvs-libpthread_build.diff
2015-08-28 01:11:03 UTC (rev 6487)
@@ -26,7 +26,7 @@
--- a/libpthread/sysdeps/generic/raise.c
+++ b/libpthread/sysdeps/generic/raise.c
-@@ -18,8 +18,9 @@
+@@ -18,8 +18,10 @@
License along with this program. If not, see
http://www.gnu.org/licenses/. */
@@ -34,6 +34,7 @@
+#include pthread.h
+#pragma weak pthread_kill
++#pragma weak pthread_self
int
raise (int signo)
{
r6484 - glibc-package/trunk/debian/rules.d
Author: sthibault
Date: 2015-08-27 08:15:00 + (Thu, 27 Aug 2015)
New Revision: 6484
Modified:
glibc-package/trunk/debian/rules.d/build.mk
Log:
fix typo
Modified: glibc-package/trunk/debian/rules.d/build.mk
===
--- glibc-package/trunk/debian/rules.d/build.mk 2015-08-26 21:55:32 UTC (rev
6483)
+++ glibc-package/trunk/debian/rules.d/build.mk 2015-08-27 08:15:00 UTC (rev
6484)
@@ -163,7 +163,7 @@
install-bootstrap-headers=yes install-headers )
install -d $(CURDIR)/debian/tmp-$(curpass)/lib
- dnstall -m 644 $(DEB_BUILDDIR)/csu/crt[01in].o
$(CURDIR)/debian/tmp-$(curpass)/lib
+ install -m 644 $(DEB_BUILDDIR)/csu/crt[01in].o
$(CURDIR)/debian/tmp-$(curpass)/lib
${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
-o $(CURDIR)/debian/tmp-$(curpass)/lib/libc.so
else
