This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.16-ports-merge-520-g8175a25
- From: vapier at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 24 Oct 2012 17:03:59 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.16-ports-merge-520-g8175a25
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 8175a2532bd19cca1592f9c7f598302c5ae3770a (commit)
from 10b40d85672e13032422572f2106752b31ed1704 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=8175a2532bd19cca1592f9c7f598302c5ae3770a
commit 8175a2532bd19cca1592f9c7f598302c5ae3770a
Author: Mike Frysinger <vapier@gentoo.org>
Date: Tue Oct 23 22:37:50 2012 -0400
drop -q flag when using grep
We don't currently want to rely on the -q option to grep.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
diff --git a/ChangeLog b/ChangeLog
index d0dd89d..0b34621 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-10-24 Mike Frysinger <vapier@gentoo.org>
+
+ * configure.in (libc_cv_gcc_static_libgcc): Drop -q flag to grep and
+ send the output to /dev/null.
+ (libc_cv_cc_with_libunwind): Likewise.
+ (libc_cv_as_noexecstack): Likewise.
+ * configure: Regenerate.
+
2012-10-24 Joseph Myers <joseph@codesourcery.com>
* io/ftwtest-sh (tmp): Define to ${objpfx}io, not using `pwd`.
diff --git a/configure b/configure
index ed5df88..2592022 100755
--- a/configure
+++ b/configure
@@ -5384,7 +5384,7 @@ $as_echo_n "checking whether GCC supports -static-libgcc... " >&6; }
if ${libc_cv_gcc_static_libgcc+:} false; then :
$as_echo_n "(cached) " >&6
else
- if $CC -v -static-libgcc 2>&1 | grep -q 'unrecognized option.*static-libgcc'; then
+ if $CC -v -static-libgcc 2>&1 | grep 'unrecognized option.*static-libgcc' >/dev/null; then
libc_cv_gcc_static_libgcc=
else
libc_cv_gcc_static_libgcc=-static-libgcc
@@ -6139,7 +6139,7 @@ else
int main (void) { return 0; }
EOF
if ${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static -o conftest \
- conftest.c -v 2>&1 >/dev/null | grep -q " -lunwind "; then
+ conftest.c -v 2>&1 >/dev/null | grep ' -lunwind ' >/dev/null; then
libc_cv_cc_with_libunwind=yes
else
libc_cv_cc_with_libunwind=no
@@ -6370,7 +6370,7 @@ if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; } \
- && grep -q .note.GNU-stack conftest.s \
+ && grep .note.GNU-stack conftest.s >/dev/null \
&& { ac_try='${CC-cc} $ASFLAGS -Wa,--noexecstack
-c -o conftest.o conftest.s 1>&5'
{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
diff --git a/configure.in b/configure.in
index 3af030a..b3fab37 100644
--- a/configure.in
+++ b/configure.in
@@ -1011,7 +1011,7 @@ AC_MSG_ERROR([
fi
AC_CACHE_CHECK(whether GCC supports -static-libgcc, libc_cv_gcc_static_libgcc, [dnl
-if $CC -v -static-libgcc 2>&1 | grep -q 'unrecognized option.*static-libgcc'; then
+if $CC -v -static-libgcc 2>&1 | grep 'unrecognized option.*static-libgcc' >/dev/null; then
libc_cv_gcc_static_libgcc=
else
libc_cv_gcc_static_libgcc=-static-libgcc
@@ -1376,7 +1376,7 @@ AC_CACHE_CHECK(for libunwind-support in compiler,
int main (void) { return 0; }
EOF
if ${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static -o conftest \
- conftest.c -v 2>&1 >/dev/null | grep -q " -lunwind "; then
+ conftest.c -v 2>&1 >/dev/null | grep ' -lunwind ' >/dev/null; then
libc_cv_cc_with_libunwind=yes
else
libc_cv_cc_with_libunwind=no
@@ -1526,7 +1526,7 @@ void foo (void) { }
EOF
if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS
-S -o conftest.s conftest.c 1>&AS_MESSAGE_LOG_FD]) \
- && grep -q .note.GNU-stack conftest.s \
+ && grep .note.GNU-stack conftest.s >/dev/null \
&& AC_TRY_COMMAND([${CC-cc} $ASFLAGS -Wa,--noexecstack
-c -o conftest.o conftest.s 1>&AS_MESSAGE_LOG_FD])
then
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 8 ++++++++
configure | 6 +++---
configure.in | 6 +++---
3 files changed, 14 insertions(+), 6 deletions(-)
hooks/post-receive
--
GNU C Library master sources