merge 3.3 (#17547)

benjaminp · benjaminp · commit a75a2ec64dd2 · 2013-05-11T13:02:59.000-05:00
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -300,6 +300,12 @@ IDLE
 
 - 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
@@ -6529,7 +6529,7 @@ then
   { $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
@@ -1333,7 +1333,7 @@ if test "$GCC" = "yes"
 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)));]], [[]])
   ],[
