[Python-checkins] r72873 - in python/branches/release26-maint: Makefile.pre.in Misc/ACKS Misc/NEWS Modules/getbuildinfo.c Python/sysmodule.c configure configure.in
benjamin.peterson
python-checkins at python.org
Sat May 23 21:35:34 CEST 2009
Author: benjamin.peterson
Date: Sat May 23 21:35:33 2009
New Revision: 72873
Log:
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
........
Modified:
python/branches/release26-maint/ (props changed)
python/branches/release26-maint/Makefile.pre.in
python/branches/release26-maint/Misc/ACKS
python/branches/release26-maint/Misc/NEWS
python/branches/release26-maint/Modules/getbuildinfo.c
python/branches/release26-maint/Python/sysmodule.c
python/branches/release26-maint/configure
python/branches/release26-maint/configure.in
Modified: python/branches/release26-maint/Makefile.pre.in
==============================================================================
--- python/branches/release26-maint/Makefile.pre.in (original)
+++ python/branches/release26-maint/Makefile.pre.in Sat May 23 21:35:33 2009
@@ -501,7 +501,7 @@
$(SIGNAL_OBJS) \
$(MODOBJS) \
$(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
$(CC) -c $(PY_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \
Modified: python/branches/release26-maint/Misc/ACKS
==============================================================================
--- python/branches/release26-maint/Misc/ACKS (original)
+++ python/branches/release26-maint/Misc/ACKS Sat May 23 21:35:33 2009
@@ -684,6 +684,7 @@
Kalle Svensson
Paul Swartz
Thenault Sylvain
+Arfrever Frehtes Taifersar Arahesis
Geoff Talvola
William Tanksley
Christian Tanzer
Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS (original)
+++ python/branches/release26-maint/Misc/NEWS Sat May 23 21:35:33 2009
@@ -98,6 +98,8 @@
Build
-----
+- Issue #6094: Build correctly with Subversion 1.7.
+
- Issue #5726: Make Modules/ld_so_aix return the actual exit code of the
linker, rather than always exit successfully. Patch by Floris Bruynooghe.
Modified: python/branches/release26-maint/Modules/getbuildinfo.c
==============================================================================
--- python/branches/release26-maint/Modules/getbuildinfo.c (original)
+++ python/branches/release26-maint/Modules/getbuildinfo.c Sat May 23 21:35:33 2009
@@ -48,5 +48,5 @@
static const char svnversion[] = SVNVERSION;
if (svnversion[0] != '$')
return svnversion; /* it was interpolated, or passed on command line */
- return "exported";
+ return "Unversioned directory";
}
Modified: python/branches/release26-maint/Python/sysmodule.c
==============================================================================
--- python/branches/release26-maint/Python/sysmodule.c (original)
+++ python/branches/release26-maint/Python/sysmodule.c Sat May 23 21:35:33 2009
@@ -1161,7 +1161,7 @@
svnversion = _Py_svnversion();
- if (strcmp(svnversion, "exported") != 0)
+ if (strcmp(svnversion, "Unversioned directory") != 0 && strcmp(svnversion, "exported") != 0)
svn_revision = svnversion;
else if (istag) {
len = strlen(_patchlevel_revision);
Modified: python/branches/release26-maint/configure
==============================================================================
--- python/branches/release26-maint/configure (original)
+++ python/branches/release26-maint/configure Sat May 23 21:35:33 2009
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 70731 .
+# From configure.in Revision: 72275 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for python 2.6.
#
@@ -4344,7 +4344,7 @@
then
SVNVERSION="svnversion \$(srcdir)"
else
- SVNVERSION="echo exported"
+ SVNVERSION="echo Unversioned directory"
fi
case $MACHDEP in
Modified: python/branches/release26-maint/configure.in
==============================================================================
--- python/branches/release26-maint/configure.in (original)
+++ python/branches/release26-maint/configure.in Sat May 23 21:35:33 2009
@@ -767,7 +767,7 @@
then
SVNVERSION="svnversion \$(srcdir)"
else
- SVNVERSION="echo exported"
+ SVNVERSION="echo Unversioned directory"
fi
case $MACHDEP in
More information about the Python-checkins
mailing list