r5790 - in glibc-package/branches/eglibc-2.18/debian: . patches/any testsuite-checking
Author: adconrad
Date: 2013-11-23 22:01:58 +0000 (Sat, 23 Nov 2013)
New Revision: 5790
Added:
glibc-package/branches/eglibc-2.18/debian/patches/any/unsubmitted-scanf-includes.diff
Modified:
glibc-package/branches/eglibc-2.18/debian/changelog
glibc-package/branches/eglibc-2.18/debian/testsuite-checking/expected-results-aarch64-linux-gnu-libc
Log:
debian/patches/any/unsubmitted-scanf-includes.diff: Fix includes for
the scanf15 and scanf17 tests for arches that need misc/bits/syscall.h.
Modified: glibc-package/branches/eglibc-2.18/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/changelog 2013-11-23 21:07:51 UTC (rev 5789)
+++ glibc-package/branches/eglibc-2.18/debian/changelog 2013-11-23 22:01:58 UTC (rev 5790)
@@ -69,6 +69,8 @@
on recent versions of gcc in nptl/tst-cleanup2 and nptl/tst-cleanupx2.
* debian/patches/any/unsubmitted-tst-tlsmod-as-needed.diff: Fix linking
tst-tlsmod5.so and tst-tlsmod6.so with an as-needed default toolchain.
+ * debian/patches/any/unsubmitted-scanf-includes.diff: Fix includes for
+ the scanf15 and scanf17 tests for arches that need misc/bits/syscall.h.
* debian/patches/any/local-use-glibc-predef.diff: Backport stdc-predef.h
from glibc instead of eglibc, avoiding bits/predefs.h (closes: #717557)
* debian/rules.d/quilt.mk: Fix unpatch with only one arch patch applied.
Added: glibc-package/branches/eglibc-2.18/debian/patches/any/unsubmitted-scanf-includes.diff
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/any/unsubmitted-scanf-includes.diff (rev 0)
+++ glibc-package/branches/eglibc-2.18/debian/patches/any/unsubmitted-scanf-includes.diff 2013-11-23 22:01:58 UTC (rev 5790)
@@ -0,0 +1,16 @@
+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
+
+ # We know the test has a format string problem.
+ CFLAGS-tst-sprintf.c = -Wno-format
Modified: glibc-package/branches/eglibc-2.18/debian/testsuite-checking/expected-results-aarch64-linux-gnu-libc
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/testsuite-checking/expected-results-aarch64-linux-gnu-libc 2013-11-23 21:07:51 UTC (rev 5789)
+++ glibc-package/branches/eglibc-2.18/debian/testsuite-checking/expected-results-aarch64-linux-gnu-libc 2013-11-23 22:01:58 UTC (rev 5790)
@@ -6,8 +6,6 @@
annexc.out, Error 1 (ignored)
check-localplt.out, Error 1
run-conformtest.out, Error 1 (ignored)
-scanf15.o, Error 1
-scanf17.o, Error 1
test-fenv.out, Error 1
tst-cpuclock2.out, Error 1
tst-cputimer1.out, Error 1
Reply to: