Author: aurel32
Date: 2015-12-12 17:02:35 +0000 (Sat, 12 Dec 2015)
New Revision: 6814
Added:
glibc-package/branches/glibc-2.22/debian/patches/any/cvs-bits-libc-stdio-lock.diff
Removed:
glibc-package/branches/glibc-2.22/debian/patches/any/unsubmitted-scanf-includes.diff
Modified:
glibc-package/branches/glibc-2.22/debian/changelog
glibc-package/branches/glibc-2.22/debian/patches/series
Log:
debian/patches/any/unsubmitted-scanf-includes.diff: replace the hack by
the upstream fix patches/any/cvs-bits-libc-stdio-lock.diff. This also
stop installing <bits/libc-lock.h> and <bits/stdio-lock.h>. Closes:
#404532, #639697.
Modified: glibc-package/branches/glibc-2.22/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.22/debian/changelog 2015-12-12 09:32:42 UTC
(rev 6813)
+++ glibc-package/branches/glibc-2.22/debian/changelog 2015-12-12 17:02:35 UTC
(rev 6814)
@@ -20,6 +20,10 @@
another way.
* debian/patches/any/local-stdio-lock.diff: drop, it was needed for
LinuxThreads support.
+ * debian/patches/any/unsubmitted-scanf-includes.diff: replace the hack by
+ the upstream fix patches/any/cvs-bits-libc-stdio-lock.diff. This also
+ stop installing <bits/libc-lock.h> and <bits/stdio-lock.h>. Closes:
+ #404532, #639697.
-- Aurelien Jarno <aure...@debian.org> Thu, 10 Dec 2015 23:41:13 +0100
Added:
glibc-package/branches/glibc-2.22/debian/patches/any/cvs-bits-libc-stdio-lock.diff
===================================================================
---
glibc-package/branches/glibc-2.22/debian/patches/any/cvs-bits-libc-stdio-lock.diff
(rev 0)
+++
glibc-package/branches/glibc-2.22/debian/patches/any/cvs-bits-libc-stdio-lock.diff
2015-12-12 17:02:35 UTC (rev 6814)
@@ -0,0 +1,78 @@
+2015-09-03 Joseph Myers <jos...@codesourcery.com>
+
+ * Makefile (headers): Remove bits/libc-lock.h.
+ * libio/Makefile (headers): Remove bits/stdio-lock.h.
+
+ * libio/libio.h [_IO_MTSAFE_IO]: Remove include of
+ <bits/stdio-lock.h> and commented-out include of <comthread.h>.
+ * include/libio.h [!_ISOMAC && _IO_MTSAFE_IO]: Include
+ <bits/stdio-lock.h>.
+ * stdio-common/scanf15.c (_IO_MTSAFE_IO): Undefine.
+ * stdio-common/scanf17.c (_IO_MTSAFE_IO): Likewise.
+
+--- a/Makefile
++++ b/Makefile
+@@ -58,7 +58,7 @@ endif # $(AUTOCONF) = no
+ subdir_objs subdir_stubs subdir_testclean \
+ $(addprefix install-, no-libc.a bin lib data headers others)
+
+-headers := limits.h values.h features.h gnu-versions.h bits/libc-lock.h \
++headers := limits.h values.h features.h gnu-versions.h \
+ bits/xopen_lim.h gnu/libc-version.h stdc-predef.h
+
+ echo-headers: subdir_echo-headers
+--- a/include/libio.h
++++ b/include/libio.h
+@@ -1,3 +1,6 @@
++#if !defined _ISOMAC && defined _IO_MTSAFE_IO
++# include <bits/stdio-lock.h>
++#endif
+ #include <libio/libio.h>
+
+ #ifndef _ISOMAC
+--- a/libio/Makefile
++++ b/libio/Makefile
+@@ -22,7 +22,7 @@ subdir := libio
+
+ include ../Makeconfig
+
+-headers := stdio.h libio.h _G_config.h bits/stdio.h bits/stdio-lock.h \
++headers := stdio.h libio.h _G_config.h bits/stdio.h \
+ bits/sys_errlist.h bits/stdio2.h bits/stdio-ldbl.h bits/libio-ldbl.h
+
+ routines := \
+--- a/libio/libio.h
++++ b/libio/libio.h
+@@ -145,11 +145,7 @@ struct _IO_jump_t; struct _IO_FILE;
+
+ /* Handle lock. */
+ #ifdef _IO_MTSAFE_IO
+-# if defined __GLIBC__ && __GLIBC__ >= 2
+-# include <bits/stdio-lock.h>
+-# else
+-/*# include <comthread.h>*/
+-# endif
++/* _IO_lock_t defined in internal headers during the glibc build. */
+ #else
+ typedef void _IO_lock_t;
+ #endif
+--- a/stdio-common/scanf15.c
++++ b/stdio-common/scanf15.c
+@@ -1,6 +1,7 @@
+ #undef _GNU_SOURCE
+ #define _XOPEN_SOURCE 600
+ #undef _LIBC
++#undef _IO_MTSAFE_IO
+ /* The following macro definitions are a hack. They word around disabling
+ the GNU extension while still using a few internal headers. */
+ #define u_char unsigned char
+--- a/stdio-common/scanf17.c
++++ b/stdio-common/scanf17.c
+@@ -1,6 +1,7 @@
+ #undef _GNU_SOURCE
+ #define _XOPEN_SOURCE 600
+ #undef _LIBC
++#undef _IO_MTSAFE_IO
+ /* The following macro definitions are a hack. They word around disabling
+ the GNU extension while still using a few internal headers. */
+ #define u_char unsigned char
Deleted:
glibc-package/branches/glibc-2.22/debian/patches/any/unsubmitted-scanf-includes.diff
===================================================================
---
glibc-package/branches/glibc-2.22/debian/patches/any/unsubmitted-scanf-includes.diff
2015-12-12 09:32:42 UTC (rev 6813)
+++
glibc-package/branches/glibc-2.22/debian/patches/any/unsubmitted-scanf-includes.diff
2015-12-12 17:02:35 UTC (rev 6814)
@@ -1,16 +0,0 @@
-diff --git a/stdio-common/Makefile b/stdio-common/Makefile
-index 16f8f1b..be58f0f 100644
---- a/stdio-common/Makefile
-+++ b/stdio-common/Makefile
-@@ -110,9 +110,9 @@ CFLAGS-siglist.c = $(fno-unit-at-a-time)
- # GNU extension. The latter are needed, though, when internal headers
- # are used. So made sure we see the installed headers first.
- CFLAGS-scanf15.c = -I../libio -I../stdlib -I../wcsmbs -I../time -I../string \
-- -I../wctype
-+ -I../wctype -I$(common-objpfx)misc
- CFLAGS-scanf17.c = -I../libio -I../stdlib -I../wcsmbs -I../time -I../string \
-- -I../wctype
-+ -I../wctype -I$(common-objpfx)misc
-
- CPPFLAGS += $(libio-mtsafe)
-
Modified: glibc-package/branches/glibc-2.22/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.22/debian/patches/series 2015-12-12
09:32:42 UTC (rev 6813)
+++ glibc-package/branches/glibc-2.22/debian/patches/series 2015-12-12
17:02:35 UTC (rev 6814)
@@ -223,7 +223,6 @@
any/local-tst-eintr1-eagain.diff
any/unsubmitted-ldso-machine-mismatch.diff
any/unsubmitted-dlopen-static-crash.diff
-any/unsubmitted-scanf-includes.diff
any/local-ldconfig-ignore-ld.so.diff
any/local-dynamic-resolvconf.diff
any/local-libpic.diff
@@ -233,3 +232,4 @@
any/local-math-logb.diff
any/cvs-grantpt-namespace.diff
any/cvs-grantpt-pty-owner.diff
+any/cvs-bits-libc-stdio-lock.diff
