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

support building with subversion 1.7 #6094

This commit is contained in:
Benjamin Peterson 2009-05-23 19:24:37 +00:00
parent f3bd687b2d
commit e5afa3b24b
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

@ -505,7 +505,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

@ -22,6 +22,7 @@ John Anderson
Erik Andersén Erik Andersén
Oliver Andrich Oliver Andrich
Ross Andrus Ross Andrus
Arfrever Frehtes Taifersar Arahesis
Jason Asbahr Jason Asbahr
David Ascher David Ascher
Chris AtLee Chris AtLee

2
Misc/NEWS
View File

@ -958,6 +958,8 @@ Tools/Demos
Build Build
----- -----
- Issue #6094: Build correctly with Subversion 1.7.
- Issue #5847: Remove -n switch on "Edit with IDLE" menu item. - Issue #5847: Remove -n switch on "Edit with IDLE" menu item.
- 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

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

@ -1158,7 +1158,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: 72497 . # From configure.in Revision: 72799 .
# 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.7. # Generated by GNU Autoconf 2.61 for python 2.7.
# #
@ -4385,7 +4385,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

@ -802,7 +802,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