[Python-checkins] cpython (merge default -> default): merge

[brett.cannon]

http://hg.python.org/cpython/rev/0dd04c39fb89
changeset:   83715:0dd04c39fb89
parent:      83714:61214ebd347d
parent:      83713:f12e3ce66ae6
user:        Brett Cannon <brett at python.org>
date:        Sat May 11 14:47:12 2013 -0400
summary:
  merge

files:
  Misc/NEWS    |  6 ++++++
  configure    |  2 +-
  configure.ac |  2 +-
  3 files changed, 8 insertions(+), 2 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -300,6 +300,12 @@
 
 - Issue #14735: Update IDLE docs to omit "Control-z on Windows".
 
+Build
+-----
+
+- Issue #17547: In configure, explicitly pass -Wformat for the benefit for GCC
+  4.8.
+
 
 What's New in Python 3.3.1 release candidate 1?
 ===============================================
diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -6529,7 +6529,7 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc supports ParseTuple __format__" >&5
 $as_echo_n "checking whether gcc supports ParseTuple __format__... " >&6; }
   save_CFLAGS=$CFLAGS
-  CFLAGS="$CFLAGS -Werror"
+  CFLAGS="$CFLAGS -Werror -Wformat"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -1333,7 +1333,7 @@
 then
   AC_MSG_CHECKING(whether gcc supports ParseTuple __format__)
   save_CFLAGS=$CFLAGS
-  CFLAGS="$CFLAGS -Werror"
+  CFLAGS="$CFLAGS -Werror -Wformat"
   AC_COMPILE_IFELSE([
     AC_LANG_PROGRAM([[void f(char*,...)__attribute((format(PyArg_ParseTuple, 1, 2)));]], [[]])
   ],[

-- 
Repository URL: http://hg.python.org/cpython