traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge 3.2

This commit is contained in:
Matthias Klose 2012-03-14 23:17:31 +01:00
parent e7c8fdee18 d83be23689
commit 5ce31cc4fc
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Include/patchlevel.h
View File

@ -2,7 +2,7 @@
/* Python version identification scheme. /* Python version identification scheme.
When the major or minor version changes, the VERSION variable in When the major or minor version changes, the VERSION variable in
configure.in must also be changed. configure.ac must also be changed.
There is also (independent) API version information in modsupport.h. There is also (independent) API version information in modsupport.h.
*/ */

4
Makefile.pre.in
View File

@ -160,7 +160,7 @@ SRCDIRS= @SRCDIRS@
SUBDIRSTOO= Include Lib Misc SUBDIRSTOO= Include Lib Misc
# Files and directories to be distributed # Files and directories to be distributed
CONFIGFILES= configure configure.in acconfig.h pyconfig.h.in Makefile.pre.in CONFIGFILES= configure configure.ac acconfig.h pyconfig.h.in Makefile.pre.in
DISTFILES= README ChangeLog $(CONFIGFILES) DISTFILES= README ChangeLog $(CONFIGFILES)
DISTDIRS= $(SUBDIRS) $(SUBDIRSTOO) Ext-dummy DISTDIRS= $(SUBDIRS) $(SUBDIRSTOO) Ext-dummy
DIST= $(DISTFILES) $(DISTDIRS) DIST= $(DISTFILES) $(DISTDIRS)
@ -1274,7 +1274,7 @@ recheck:
$(SHELL) config.status --recheck $(SHELL) config.status --recheck
$(SHELL) config.status $(SHELL) config.status
# Rebuild the configure script from configure.in; also rebuild pyconfig.h.in # Rebuild the configure script from configure.ac; also rebuild pyconfig.h.in
autoconf: autoconf:
(cd $(srcdir); autoconf -Wall) (cd $(srcdir); autoconf -Wall)
(cd $(srcdir); autoheader -Wall) (cd $(srcdir); autoheader -Wall)

2
PC/pyconfig.h
View File

@ -340,7 +340,7 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */
# define SIZEOF_FPOS_T 8 # define SIZEOF_FPOS_T 8
# define SIZEOF_HKEY 8 # define SIZEOF_HKEY 8
# define SIZEOF_SIZE_T 8 # define SIZEOF_SIZE_T 8
/* configure.in defines HAVE_LARGEFILE_SUPPORT iff HAVE_LONG_LONG, /* configure.ac defines HAVE_LARGEFILE_SUPPORT iff HAVE_LONG_LONG,
sizeof(off_t) > sizeof(long), and sizeof(PY_LONG_LONG) >= sizeof(off_t). sizeof(off_t) > sizeof(long), and sizeof(PY_LONG_LONG) >= sizeof(off_t).
On Win64 the second condition is not true, but if fpos_t replaces off_t On Win64 the second condition is not true, but if fpos_t replaces off_t
then this is true. The uses of HAVE_LARGEFILE_SUPPORT imply that Win64 then this is true. The uses of HAVE_LARGEFILE_SUPPORT imply that Win64

4
Tools/scripts/patchcheck.py
View File

@ -135,7 +135,7 @@ def reported_news(file_paths):
@status("configure regenerated", modal=True, info=str) @status("configure regenerated", modal=True, info=str)
def regenerated_configure(file_paths): def regenerated_configure(file_paths):
"""Check if configure has been regenerated.""" """Check if configure has been regenerated."""
if 'configure.in' in file_paths: if 'configure.ac' in file_paths:
return "yes" if 'configure' in file_paths else "no" return "yes" if 'configure' in file_paths else "no"
else: else:
return "not needed" return "not needed"
@ -143,7 +143,7 @@ def regenerated_configure(file_paths):
@status("pyconfig.h.in regenerated", modal=True, info=str) @status("pyconfig.h.in regenerated", modal=True, info=str)
def regenerated_pyconfig_h_in(file_paths): def regenerated_pyconfig_h_in(file_paths):
"""Check if pyconfig.h.in has been regenerated.""" """Check if pyconfig.h.in has been regenerated."""
if 'configure.in' in file_paths: if 'configure.ac' in file_paths:
return "yes" if 'pyconfig.h.in' in file_paths else "no" return "yes" if 'pyconfig.h.in' in file_paths else "no"
else: else:
return "not needed" return "not needed"

4
configure vendored
View File

@ -14599,8 +14599,8 @@ esac
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# Files that config.status was made for. # Files that config.status was made for.
config_files="`echo $ac_config_files`" config_files="$ac_config_files"
config_headers="`echo $ac_config_headers`" config_headers="$ac_config_headers"
_ACEOF _ACEOF

0
configure.in → configure.ac
View File

2
pyconfig.h.in
View File

@ -1,4 +1,4 @@
/* pyconfig.h.in. Generated from configure.in by autoheader. */ /* pyconfig.h.in. Generated from configure.ac by autoheader. */
#ifndef Py_PYCONFIG_H #ifndef Py_PYCONFIG_H