[glibc] 01/01: hurd-i386/cvs-libpthread.so.diff: Fix building malloc tests
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch sid
in repository glibc.
commit 7b2816e9a59f1e49d71e5a9fbb8b0c201754556d
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Thu May 12 01:06:10 2016 +0200
hurd-i386/cvs-libpthread.so.diff: Fix building malloc tests
---
debian/changelog | 6 ++++++
debian/patches/hurd-i386/cvs-libpthread.so.diff | 21 +++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 28 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 8995ed9..718f505 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+glibc (2.22-9) UNRELEASED; urgency=medium
+
+ * hurd-i386/cvs-libpthread.so.diff: Fix building malloc tests.
+
+ -- Samuel Thibault <sthibault@debian.org> Thu, 12 May 2016 01:05:26 +0200
+
glibc (2.22-8) unstable; urgency=medium
[ Samuel Thibault ]
diff --git a/debian/patches/hurd-i386/cvs-libpthread.so.diff b/debian/patches/hurd-i386/cvs-libpthread.so.diff
new file mode 100644
index 0000000..a706865
--- /dev/null
+++ b/debian/patches/hurd-i386/cvs-libpthread.so.diff
@@ -0,0 +1,21 @@
+Hardcoded nptl path...
+
+https://sourceware.org/ml/libc-alpha/2016-03/msg00437.html
+
+diff --git a/malloc/Makefile b/malloc/Makefile
+index 360288b..59d4264 100644
+--- a/malloc/Makefile
++++ b/malloc/Makefile
+@@ -46,10 +46,8 @@ extra-libs-others = $(extra-libs)
+ libmemusage-routines = memusage
+ libmemusage-inhibit-o = $(filter-out .os,$(object-suffixes))
+
+-$(objpfx)tst-malloc-backtrace: $(common-objpfx)nptl/libpthread.so \
+- $(common-objpfx)nptl/libpthread_nonshared.a
+-$(objpfx)tst-malloc-thread-exit: $(common-objpfx)nptl/libpthread.so \
+- $(common-objpfx)nptl/libpthread_nonshared.a
++$(objpfx)tst-malloc-backtrace: $(shared-thread-library)
++$(objpfx)tst-malloc-thread-exit: $(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 9fab432..bc30ebc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -151,6 +151,7 @@ hurd-i386/cvs-raise-longjump.diff
hurd-i386/submitted-hurd-abilist.diff
hurd-i386/cvs-errnos.d.diff
hurd-i386/cvs-mach-syscalls.mk.diff
+hurd-i386/cvs-libpthread.so.diff
hurd-i386/cvs-auxv.diff
#hurd-i386/submitted-anon-mmap-shared.diff
hurd-i386/cvs-gprof-tick.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: