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
........
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 5c5e29c..689d248 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -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)"' \
diff --git a/Misc/ACKS b/Misc/ACKS
index 9573698..e0890e8 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -684,6 +684,7 @@
Kalle Svensson
Paul Swartz
Thenault Sylvain
+Arfrever Frehtes Taifersar Arahesis
Geoff Talvola
William Tanksley
Christian Tanzer
diff --git a/Misc/NEWS b/Misc/NEWS
index 018854b..6fdbd0b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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.
diff --git a/Modules/getbuildinfo.c b/Modules/getbuildinfo.c
index b673f3f..f4bd14a 100644
--- a/Modules/getbuildinfo.c
+++ b/Modules/getbuildinfo.c
@@ -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";
}
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index ff7157f..10ba1cf 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -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);
diff --git a/configure b/configure
index 67725d7..69f15ac 100755
--- a/configure
+++ b/configure
@@ -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
diff --git a/configure.in b/configure.in
index 6730b4c..481d400 100644
--- a/configure.in
+++ b/configure.in
@@ -767,7 +767,7 @@
then
SVNVERSION="svnversion \$(srcdir)"
else
- SVNVERSION="echo exported"
+ SVNVERSION="echo Unversioned directory"
fi
case $MACHDEP in