This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch glibc-2.23
in repository glibc.
commit 66e14ee7bd1eac4c4b0dceac5b8d5ea40745c3e6
Author: Samuel Thibault <samuel.thiba...@ens-lyon.org>
Date: Tue Mar 22 10:01:52 2016 +0100
hurd-i386/unsubmitted-libpthread.so.diff: use CVS commit
---
debian/changelog | 2 +-
...tted-libpthread.so.diff => cvs-libpthread.so.diff} | 19 ++++++++-----------
debian/patches/series | 1 +
debian/patches/series.hurd-i386 | 1 -
4 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a0045d1..de92856 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,7 @@ glibc (2.23-0experimental1) UNRELEASED; urgency=medium
* hurd-i386/cvs-aio_sigqueue.diff: Fix aio_sigqueue prototype.
* hurd-i386/cvs-libpthread.diff: Separate 2.23 changes to...
* hurd-i386/cvs-libpthread-2.23.diff: ... separate patch.
- * hurd-i386/unsubmitted-libpthread.so.diff: Fix building malloc tests.
+ * hurd-i386/cvs-libpthread.so.diff: Fix building malloc tests.
* testsuite-xfail-debian.mk: Skip test which just overflows memory.
* hurd-i386/cvs-pt-kill.diff: Fix pthread_kill locking.
* hurd-i386/cvs-open.diff: Fix __open in ld.so, thus fixing dlopen().
diff --git a/debian/patches/hurd-i386/unsubmitted-libpthread.so.diff
b/debian/patches/hurd-i386/cvs-libpthread.so.diff
similarity index 51%
rename from debian/patches/hurd-i386/unsubmitted-libpthread.so.diff
rename to debian/patches/hurd-i386/cvs-libpthread.so.diff
index 33bb159..921c6ed 100644
--- a/debian/patches/hurd-i386/unsubmitted-libpthread.so.diff
+++ b/debian/patches/hurd-i386/cvs-libpthread.so.diff
@@ -2,11 +2,11 @@ Hardcoded nptl path...
https://sourceware.org/ml/libc-alpha/2016-03/msg00437.html
-Index: glibc-2.23/malloc/Makefile
-===================================================================
---- glibc-2.23.orig/malloc/Makefile
-+++ glibc-2.23/malloc/Makefile
-@@ -46,12 +46,12 @@ extra-libs-others = $(extra-libs)
+diff --git a/malloc/Makefile b/malloc/Makefile
+index 360288b..59d4264 100644
+--- a/malloc/Makefile
++++ b/malloc/Makefile
+@@ -46,12 +46,9 @@ extra-libs-others = $(extra-libs)
libmemusage-routines = memusage
libmemusage-inhibit-o = $(filter-out .os,$(object-suffixes))
@@ -16,12 +16,9 @@ Index: glibc-2.23/malloc/Makefile
- $(common-objpfx)nptl/libpthread_nonshared.a
-$(objpfx)tst-malloc-thread-fail: $(common-objpfx)nptl/libpthread.so \
- $(common-objpfx)nptl/libpthread_nonshared.a
-+$(objpfx)tst-malloc-backtrace: $(common-objpfx)libpthread/libpthread.so \
-+ $(common-objpfx)libpthread/libpthread.a
-+$(objpfx)tst-malloc-thread-exit: $(common-objpfx)libpthread/libpthread.so \
-+ $(common-objpfx)libpthread/libpthread.a
-+$(objpfx)tst-malloc-thread-fail: $(common-objpfx)libpthread/libpthread.so \
-+ $(common-objpfx)libpthread/libpthread.a
++$(objpfx)tst-malloc-backtrace: $(shared-thread-library)
++$(objpfx)tst-malloc-thread-exit: $(shared-thread-library)
++$(objpfx)tst-malloc-thread-fail: $(shared-thread-library)
# These should be removed by `make clean'.
extra-objs = mcheck-init.o libmcheck.a
diff --git a/debian/patches/series b/debian/patches/series
index da42d63..258a11e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -141,6 +141,7 @@ hurd-i386/local-ihash-use.diff
hurd-i386/cvs-errnos.d.diff
hurd-i386/cvs-mach-syscalls.mk.diff
hurd-i386/local-versions.diff
+hurd-i386/cvs-libpthread.so.diff
i386/local-biarch.diff
i386/local-cmov.diff
diff --git a/debian/patches/series.hurd-i386 b/debian/patches/series.hurd-i386
index b7cb1b0..4629e1b 100644
--- a/debian/patches/series.hurd-i386
+++ b/debian/patches/series.hurd-i386
@@ -12,4 +12,3 @@ hurd-i386/tg-pagesize.diff
hurd-i386/local-no-bootstrap-fs-access.diff
hurd-i386/unsubmitted-timer_routines.diff
hurd-i386/local-versions-hack.diff
-hurd-i386/unsubmitted-libpthread.so.diff
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-glibc/glibc.git
