Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 72871-72872 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72871 | benjamin.peterson | 2009-05-23 14:24:37 -0500 (Sat, 23 May 2009) | 1 line

  support building with subversion 1.7 #6094
........
  r72872 | benjamin.peterson | 2009-05-23 14:31:02 -0500 (Sat, 23 May 2009) | 1 line

  reorder name
........
This commit is contained in:
Benjamin Peterson 2009-05-23 19:35:33 +00:00
parent f658e82daf
commit 2eb65457a8
7 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.pre.in
View File

@ -501,7 +501,7 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \
$(SIGNAL_OBJS) \ $(SIGNAL_OBJS) \
$(MODOBJS) \ $(MODOBJS) \
$(srcdir)/Modules/getbuildinfo.c $(srcdir)/Modules/getbuildinfo.c
$(CC) -c $(PY_CFLAGS) -DSVNVERSION=\"`LC_ALL=C $(SVNVERSION)`\" -o $@ $(srcdir)/Modules/getbuildinfo.c $(CC) -c $(PY_CFLAGS) -DSVNVERSION="\"`LC_ALL=C $(SVNVERSION)`\"" -o $@ $(srcdir)/Modules/getbuildinfo.c
Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile
$(CC) -c $(PY_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \ $(CC) -c $(PY_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \

1
Misc/ACKS
View File

@ -684,6 +684,7 @@ Andrew Svetlov
Kalle Svensson Kalle Svensson
Paul Swartz Paul Swartz
Thenault Sylvain Thenault Sylvain
Arfrever Frehtes Taifersar Arahesis
Geoff Talvola Geoff Talvola
William Tanksley William Tanksley
Christian Tanzer Christian Tanzer

2
Misc/NEWS
View File

@ -98,6 +98,8 @@ Library
Build Build
----- -----
- Issue #6094: Build correctly with Subversion 1.7.
- Issue #5726: Make Modules/ld_so_aix return the actual exit code of the - Issue #5726: Make Modules/ld_so_aix return the actual exit code of the
linker, rather than always exit successfully. Patch by Floris Bruynooghe. linker, rather than always exit successfully. Patch by Floris Bruynooghe.

2
Modules/getbuildinfo.c
View File

@ -48,5 +48,5 @@ _Py_svnversion(void)
static const char svnversion[] = SVNVERSION; static const char svnversion[] = SVNVERSION;
if (svnversion[0] != '$') if (svnversion[0] != '$')
return svnversion; /* it was interpolated, or passed on command line */ return svnversion; /* it was interpolated, or passed on command line */
return "exported"; return "Unversioned directory";
} }

2
Python/sysmodule.c
View File

@ -1161,7 +1161,7 @@ svnversion_init(void)
svnversion = _Py_svnversion(); svnversion = _Py_svnversion();
if (strcmp(svnversion, "exported") != 0) if (strcmp(svnversion, "Unversioned directory") != 0 && strcmp(svnversion, "exported") != 0)
svn_revision = svnversion; svn_revision = svnversion;
else if (istag) { else if (istag) {
len = strlen(_patchlevel_revision); len = strlen(_patchlevel_revision);

4
configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Revision: 70731 . # From configure.in Revision: 72275 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for python 2.6. # Generated by GNU Autoconf 2.61 for python 2.6.
# #
@ -4344,7 +4344,7 @@ if test $SVNVERSION = found
then then
SVNVERSION="svnversion \$(srcdir)" SVNVERSION="svnversion \$(srcdir)"
else else
SVNVERSION="echo exported" SVNVERSION="echo Unversioned directory"
fi fi
case $MACHDEP in case $MACHDEP in

2
configure.in
View File

@ -767,7 +767,7 @@ if test $SVNVERSION = found
then then
SVNVERSION="svnversion \$(srcdir)" SVNVERSION="svnversion \$(srcdir)"
else else
SVNVERSION="echo exported" SVNVERSION="echo Unversioned directory"
fi fi
case $MACHDEP in case $MACHDEP in