[Python-checkins] r72871 - in python/trunk: Makefile.pre.in Misc/ACKS Misc/NEWS Modules/getbuildinfo.c Python/sysmodule.c configure configure.in

Sat May 23 21:24:37 CEST 2009

Author: benjamin.peterson
Date: Sat May 23 21:24:37 2009
New Revision: 72871
Log:
support building with subversion 1.7 #6094
Modified:
 python/trunk/Makefile.pre.in
 python/trunk/Misc/ACKS
 python/trunk/Misc/NEWS
 python/trunk/Modules/getbuildinfo.c
 python/trunk/Python/sysmodule.c
 python/trunk/configure
 python/trunk/configure.in
Modified: python/trunk/Makefile.pre.in
==============================================================================

--- python/trunk/Makefile.pre.in	(original)
+++ python/trunk/Makefile.pre.in	Sat May 23 21:24:37 2009
@@ -505,7 +505,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/trunk/Misc/ACKS
==============================================================================
--- python/trunk/Misc/ACKS	(original)
+++ python/trunk/Misc/ACKS	Sat May 23 21:24:37 2009
@@ -22,6 +22,7 @@
 Erik Andersén
 Oliver Andrich
 Ross Andrus
+Arfrever Frehtes Taifersar Arahesis
 Jason Asbahr
 David Ascher
 Chris AtLee
Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Sat May 23 21:24:37 2009
@@ -958,6 +958,8 @@
 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
Modified: python/trunk/Modules/getbuildinfo.c
==============================================================================
--- python/trunk/Modules/getbuildinfo.c	(original)
+++ python/trunk/Modules/getbuildinfo.c	Sat May 23 21:24:37 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/trunk/Python/sysmodule.c
==============================================================================
--- python/trunk/Python/sysmodule.c	(original)
+++ python/trunk/Python/sysmodule.c	Sat May 23 21:24:37 2009
@@ -1158,7 +1158,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/trunk/configure
==============================================================================
--- python/trunk/configure	(original)
+++ python/trunk/configure	Sat May 23 21:24:37 2009
@@ -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 @@
 then
 	SVNVERSION="svnversion \$(srcdir)"
 else
-	SVNVERSION="echo exported"
+	SVNVERSION="echo Unversioned directory"
 fi
 
 case $MACHDEP in
Modified: python/trunk/configure.in
==============================================================================
--- python/trunk/configure.in	(original)
+++ python/trunk/configure.in	Sat May 23 21:24:37 2009
@@ -802,7 +802,7 @@
 then
 	SVNVERSION="svnversion \$(srcdir)"
 else
-	SVNVERSION="echo exported"
+	SVNVERSION="echo Unversioned directory"
 fi
 
 case $MACHDEP in
