summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2013-05-11 18:02:59 (GMT)
committerBenjamin Peterson <benjamin@python.org>2013-05-11 18:02:59 (GMT)
commita75a2ec64dd2d8db00b843fc117b57ea212786d0 (patch)
treed6ef3b80402d7a0ebffba0294c732b76d8e4d63b
parent7ce35a1816254b82ac4e3196df9b17bc9585997f (diff)
parentfeb51492442881994f8d42dddfac2763794dbaec (diff)
downloadcpython-a75a2ec64dd2d8db00b843fc117b57ea212786d0.zip
cpython-a75a2ec64dd2d8db00b843fc117b57ea212786d0.tar.gz
cpython-a75a2ec64dd2d8db00b843fc117b57ea212786d0.tar.bz2
merge 3.3 (#17547)
-rw-r--r--Misc/NEWS6
-rwxr-xr-xconfigure2
-rw-r--r--configure.ac2
3 files changed, 8 insertions, 2 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index bbf6943..22e038b 100644
--- 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
index 53d3890..a414fe0 100755
--- 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
index 053e4a4..a70a752 100644
--- 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)));]], [[]])
],[