From feb51492442881994f8d42dddfac2763794dbaec Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 11 May 2013 13:00:05 -0500
Subject: -Wformat is needed by gcc 4.8 (closes #17547)

---
 Misc/NEWS     | 6 ++++++
 configure     | 2 +-
 configure.ac  | 2 +-
 pyconfig.h.in | 3 ---
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
index bccd7f66..c741076 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -223,6 +223,12 @@ Documentation
 - Issue #6696: add documentation for the Profile objects, and improve
   profile/cProfile docs.  Patch by Tom Pinckney.
 
+Build
+-----
+
+- Issue #17547: In configure, explicitly pass -Wformat for the benefit for GCC
+  4.8.
+
 
 What's New in Python 3.3.1?
 ===========================
diff --git a/configure b/configure
index d3214ab..ffa089c 100755
--- a/configure
+++ b/configure
@@ -6525,7 +6525,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
index 6d54b16..9179fe6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1331,7 +1331,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)));]], [[]])
   ],[
diff --git a/pyconfig.h.in b/pyconfig.h.in
index 10e2c91..cbbc42d 100644
--- a/pyconfig.h.in
+++ b/pyconfig.h.in
@@ -1187,9 +1187,6 @@
 /* Define if setpgrp() must be called as setpgrp(0, 0). */
 #undef SETPGRP_HAVE_ARG
 
-/* Define this to be extension of shared libraries (including the dot!). */
-#undef SHLIB_EXT
-
 /* Define if i>>j for signed int i does not extend the sign bit when i < 0 */
 #undef SIGNED_RIGHT_SHIFT_ZERO_FILLS
 
-- 
cgit v0.12