This is an automated email from the git hooks/post-receive script. sthibault pushed a commit to branch glibc-2.25 in repository glibc.
commit 57197914698abc59b8c6600b26625b3261facfaa Author: Samuel Thibault <samuel.thiba...@ens-lyon.org> Date: Wed Aug 2 23:02:46 2017 +0000 Revert "patches/hurd-i386/cvs-libpthread.diff: update" This reverts commit afc4350f281ad3c36953cd265f49c30660a505a1. --- debian/changelog | 1 - debian/patches/hurd-i386/cvs-libpthread.diff | 9 ++++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 058ac7e..a2169f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,6 @@ glibc (2.25-0experimental1) UNRELEASED; urgency=medium * patches/hurd-i386/submitted-malloc-setstate.diff: update. * patches/hurd-i386/submitted-shm_open_pthread.diff: new patch. * patches/hurd-i386/cvs-libc_init_secure.diff: new patch. - * patches/hurd-i386/cvs-libpthread.diff: update. -- Aurelien Jarno <aure...@debian.org> Wed, 02 Aug 2017 19:03:14 +0200 diff --git a/debian/patches/hurd-i386/cvs-libpthread.diff b/debian/patches/hurd-i386/cvs-libpthread.diff index 91ac1b7..78ed30a 100644 --- a/debian/patches/hurd-i386/cvs-libpthread.diff +++ b/debian/patches/hurd-i386/cvs-libpthread.diff @@ -1,7 +1,7 @@ -git diff empty --patch-with-stat --src-prefix=glibc/libpthread/ --dst-prefix=glibc/libpthread/ d3b47d4482e0c8372f51472d9d075a89759919ea +git diff empty --patch-with-stat --src-prefix=glibc/libpthread/ --dst-prefix=glibc/libpthread/ 44873df420d128972644ef3901c7d917ca3b7dd7 from git.savannah.gnu.org:/srv/git/hurd/libpthread.git/ thus by construction only libpthread/ files, thus hurd-only -Date: Thu Aug 3 00:50:29 2017 +0200 +Date: Tue Nov 1 15:13:47 2016 +0100 ChangeLog | 6 + Makeconfig | 13 + @@ -252,7 +252,7 @@ new file mode 100644 index 0000000..e90f5f7 --- /dev/null +++ glibc/libpthread/Makeconfig -@@ -0,0 +1,14 @@ +@@ -0,0 +1,13 @@ +# Makeconfig fragment for Hurd libpthread add-on. +# This gets included at the end of the main glibc Makeconfig. + @@ -260,8 +260,7 @@ index 0000000..e90f5f7 + +shared-thread-library = $(common-objpfx)libpthread/libpthread_nonshared.a \ + $(common-objpfx)libpthread/libpthread.so -+static-thread-library = $(common-objpfx)libpthread/libpthread.a \ -+ -lihash ++static-thread-library = $(common-objpfx)libpthread/libpthread.a +bounded-thread-library = $(static-thread-library) + +rpath-dirs += libpthread -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git