mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge 3.3 (#17547)

This commit is contained in:
Benjamin Peterson 2013-05-11 13:02:59 -05:00
parent 7ce35a1816 feb5149244
commit a75a2ec64d
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Misc/NEWS
View File

@ -300,6 +300,12 @@ IDLE
- Issue #14735: Update IDLE docs to omit "Control-z on Windows". - 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? What's New in Python 3.3.1 release candidate 1?
=============================================== ===============================================

2
configure vendored
View File

@ -6529,7 +6529,7 @@ then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc supports ParseTuple __format__" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc supports ParseTuple __format__" >&5
$as_echo_n "checking whether gcc supports ParseTuple __format__... " >&6; } $as_echo_n "checking whether gcc supports ParseTuple __format__... " >&6; }
save_CFLAGS=$CFLAGS save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -Werror" CFLAGS="$CFLAGS -Werror -Wformat"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */

2
configure.ac
View File

@ -1333,7 +1333,7 @@ if test "$GCC" = "yes"
then then
AC_MSG_CHECKING(whether gcc supports ParseTuple __format__) AC_MSG_CHECKING(whether gcc supports ParseTuple __format__)
save_CFLAGS=$CFLAGS save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -Werror" CFLAGS="$CFLAGS -Werror -Wformat"
AC_COMPILE_IFELSE([ AC_COMPILE_IFELSE([
AC_LANG_PROGRAM([[void f(char*,...)__attribute((format(PyArg_ParseTuple, 1, 2)));]], [[]]) AC_LANG_PROGRAM([[void f(char*,...)__attribute((format(PyArg_ParseTuple, 1, 2)));]], [[]])
],[ ],[