[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[glibc] 01/01: debian/patches/kfreebsd/local-tst-malloc-fbtl.diff: drop, obsoleted by hurd-i386/cvs-libpthread.so.diff.



This is an automated email from the git hooks/post-receive script.

aurel32 pushed a commit to branch glibc-2.23
in repository glibc.

commit 08d2637cbc7b998223abac963c938ac58190ebfc
Author: Aurelien Jarno <aurelien@aurel32.net>
Date:   Tue Mar 22 11:02:17 2016 +0100

    debian/patches/kfreebsd/local-tst-malloc-fbtl.diff: drop, obsoleted by hurd-i386/cvs-libpthread.so.diff.
---
 debian/changelog                                   |  2 ++
 debian/patches/kfreebsd/local-tst-malloc-fbtl.diff | 21 ---------------------
 debian/patches/series.kfreebsd-amd64               |  1 -
 debian/patches/series.kfreebsd-i386                |  1 -
 4 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index de92856..c7e57ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ glibc (2.23-0experimental1) UNRELEASED; urgency=medium
     test as xfail, it is a known issue and not a regression.
   * patches/kfreebsd/local-fbtl.diff: update to revision 5958 (from
     glibc-bsd).
+  * debian/patches/kfreebsd/local-tst-malloc-fbtl.diff: drop, obsoleted by
+    hurd-i386/cvs-libpthread.so.diff.
 
   [ Samuel Thibault ]
   * hurd-i386/cvs-libpthread.diff: More updates to glibc-2.23.
diff --git a/debian/patches/kfreebsd/local-tst-malloc-fbtl.diff b/debian/patches/kfreebsd/local-tst-malloc-fbtl.diff
deleted file mode 100644
index cbe4f21..0000000
--- a/debian/patches/kfreebsd/local-tst-malloc-fbtl.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/malloc/Makefile
-+++ b/malloc/Makefile
-@@ -46,12 +46,12 @@ 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-thread-fail: $(common-objpfx)nptl/libpthread.so \
--			       $(common-objpfx)nptl/libpthread_nonshared.a
-+$(objpfx)tst-malloc-backtrace: $(common-objpfx)fbtl/libpthread.so \
-+			       $(common-objpfx)fbtl/libpthread_nonshared.a
-+$(objpfx)tst-malloc-thread-exit: $(common-objpfx)fbtl/libpthread.so \
-+			       $(common-objpfx)fbtl/libpthread_nonshared.a
-+$(objpfx)tst-malloc-thread-fail: $(common-objpfx)fbtl/libpthread.so \
-+			       $(common-objpfx)fbtl/libpthread_nonshared.a
- 
- # These should be removed by `make clean'.
- extra-objs = mcheck-init.o libmcheck.a
diff --git a/debian/patches/series.kfreebsd-amd64 b/debian/patches/series.kfreebsd-amd64
index 3eddd34..54c50d0 100644
--- a/debian/patches/series.kfreebsd-amd64
+++ b/debian/patches/series.kfreebsd-amd64
@@ -3,4 +3,3 @@ kfreebsd/local-sys_queue_h.diff
 kfreebsd/local-undef-glibc.diff
 kfreebsd/local-initgroups-order.diff
 kfreebsd/local-tst-auxv.diff
-kfreebsd/local-tst-malloc-fbtl.diff
diff --git a/debian/patches/series.kfreebsd-i386 b/debian/patches/series.kfreebsd-i386
index 3eddd34..54c50d0 100644
--- a/debian/patches/series.kfreebsd-i386
+++ b/debian/patches/series.kfreebsd-i386
@@ -3,4 +3,3 @@ kfreebsd/local-sys_queue_h.diff
 kfreebsd/local-undef-glibc.diff
 kfreebsd/local-initgroups-order.diff
 kfreebsd/local-tst-auxv.diff
-kfreebsd/local-tst-malloc-fbtl.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git


Reply to: