[glibc] 01/01: Update kfreebsd-i386 specific patches
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 1a9bc346b69e55a2564b39b26cdea8cfc3ca89d8
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Sun Mar 13 13:16:47 2016 +0100
Update kfreebsd-i386 specific patches
---
debian/changelog | 3 +++
.../kfreebsd/local-tst-malloc-backtrace.diff | 13 -------------
debian/patches/kfreebsd/local-tst-malloc-fbtl.diff | 21 +++++++++++++++++++++
debian/patches/kfreebsd/local-undef-glibc.diff | 4 ++--
debian/patches/series.kfreebsd-i386 | 2 +-
5 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 95e1c7a..41fcac6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -63,6 +63,9 @@ glibc (2.23-0experimental0) UNRELEASED; urgency=medium
- debian/patches/any/cvs-bits-libc-stdio-lock.diff: upstreamed.
- debian/patches/any/submitted-hle-checking-mutex.diff: upstreamed.
- debian/{control,symbols.wildcards,copyright}: Updated strings for 2.23.
+ - debian/patches/kfreebsd/local-undef-glibc.diff: rebased.
+ - debian/patches/kfreebsd/local-tst-malloc-backtrace.diff: rebased,
+ renamed into local-tst-malloc-fbtl.diff.
* debian/testsuite-xfail-debian.mk (powerpc) mark tst-malloc-thread-fail
test as xfail, it is a known issue and not a regression.
* debian/testsuite-xfail-debian.mk (mipsel): mark a few math tests are
diff --git a/debian/patches/kfreebsd/local-tst-malloc-backtrace.diff b/debian/patches/kfreebsd/local-tst-malloc-backtrace.diff
deleted file mode 100644
index 4444d48..0000000
--- a/debian/patches/kfreebsd/local-tst-malloc-backtrace.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/malloc/Makefile
-+++ b/malloc/Makefile
-@@ -45,8 +45,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-backtrace: $(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/kfreebsd/local-tst-malloc-fbtl.diff b/debian/patches/kfreebsd/local-tst-malloc-fbtl.diff
new file mode 100644
index 0000000..cbe4f21
--- /dev/null
+++ b/debian/patches/kfreebsd/local-tst-malloc-fbtl.diff
@@ -0,0 +1,21 @@
+--- 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/kfreebsd/local-undef-glibc.diff b/debian/patches/kfreebsd/local-undef-glibc.diff
index 6cb540f..f0c9c2b 100644
--- a/debian/patches/kfreebsd/local-undef-glibc.diff
+++ b/debian/patches/kfreebsd/local-undef-glibc.diff
@@ -8,11 +8,11 @@ Upstream status: REJECTED. DO NOT SUBMIT. (send to debian instead)
--- a/include/features.h
+++ b/include/features.h
-@@ -349,6 +349,7 @@
+@@ -352,6 +352,7 @@
/* Major and minor version number of the GNU C library package. Use
these macros to test for features in specific releases. */
+#undef __GLIBC__
#define __GLIBC__ 2
- #define __GLIBC_MINOR__ 21
+ #define __GLIBC_MINOR__ 23
diff --git a/debian/patches/series.kfreebsd-i386 b/debian/patches/series.kfreebsd-i386
index 8dd4b9b..3eddd34 100644
--- a/debian/patches/series.kfreebsd-i386
+++ b/debian/patches/series.kfreebsd-i386
@@ -3,4 +3,4 @@ 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-backtrace.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: