support building with subversion 1.7 #6094

diff --git a/Makefile.pre.in b/Makefile.pre.in
index f6844f94860ced9da481d078680df232983c1c50..eff2f5856718c8c5e05bdb82953650c95cb38419 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -505,7 +505,7 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \
                $(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 ccb782774ea64c84e971f04d3ab11b8aeb1a1e38..29c1b1d78e7de769b0aaebd928cd0c30174f96d5 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -22,6 +22,7 @@ John Anderson
 Erik Andersén
 Oliver Andrich
 Ross Andrus
+Arfrever Frehtes Taifersar Arahesis
 Jason Asbahr
 David Ascher
 Chris AtLee

diff --git a/Misc/NEWS b/Misc/NEWS
index ba1e7e446c25b94edff90a86d7797302d9bdd4fd..deb8a0b7b3e68871fd88ac79be9c6879cdfdc8c6 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -958,6 +958,8 @@ Tools/Demos
 Build
 -----
 
+- Issue #6094: Build correctly with Subversion 1.7.
+
 - 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

diff --git a/Modules/getbuildinfo.c b/Modules/getbuildinfo.c
index b673f3f98d4150a2993dcd37fa5e8eaf07d2ce7d..f4bd14aa930ca8e8f8df18e7412c79ea433d04a4 100644 (file)
--- a/Modules/getbuildinfo.c
+++ b/Modules/getbuildinfo.c
@@ -48,5 +48,5 @@ _Py_svnversion(void)
        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 6c22b8f7c98ccccd37ed93b04320be5fe74858bb..1146746873d48f00045a6a113fc377c777e1c21a 100644 (file)
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -1158,7 +1158,7 @@ svnversion_init(void)
 
 
        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 54c93c0ecee04bd0996df381acc8779e9e3ccb13..b8bbc856955591905ce9eb8cab7a68b5a05dfdf3 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 72497 .
+# From configure.in Revision: 72799 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for python 2.7.
 #
@@ -4385,7 +4385,7 @@ if test $SVNVERSION = found
 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 04ead3042adfb4383d445dfe1ad9938311310360..b270e083ab24c32f7350d11e6ad268b919147a4b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -802,7 +802,7 @@ if test $SVNVERSION = found
 then
        SVNVERSION="svnversion \$(srcdir)"
 else
-       SVNVERSION="echo exported"
+       SVNVERSION="echo Unversioned directory"
 fi
 
 case $MACHDEP in