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 50664b13e6485c5b660128298748d860b64a5192..ef93703acc0b172645e6ea9303a3afe31ab6d871 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -524,7 +524,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 b31a3b6dba31aca92af0b97126ad1d48c594643f..e7b62576ea9bac23ba6a5069bb1073e27a2f1309 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -709,6 +709,7 @@ Kalle Svensson
 Andrew Svetlov
 Paul Swartz
 Thenault Sylvain
+Arfrever Frehtes Taifersar Arahesis
 Geoff Talvola
 Musashi Tamura
 William Tanksley

diff --git a/Misc/NEWS b/Misc/NEWS
index dc9fe457064e241a1d680e840b3c7410067d8a9a..378868e91d3d4f6b336a0e47bc239bf5d2222231 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1081,6 +1081,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 b9d5dbaefee9049e4beb2105e898c0ac86b8f5da..6639acc7d104ec169725742c40b48ae28219d458 100644 (file)
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -1115,7 +1115,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 ca9eac25e15ac01fb4c1b0167071a1fe267d4a72..f06655e3714ed1a37a54ad95fd157cfd37089556 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 72800 .
+# From configure.in Revision: 72865 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for python 3.1.
 #
@@ -4333,7 +4333,7 @@ if test $SVNVERSION = found
 then
        SVNVERSION="svnversion \$(srcdir)"
 else
-       SVNVERSION="echo exported"
+       SVNVERSION="echo Unversioned directory"
 fi
 
 case $MACHDEP in
@@ -13516,14 +13516,6 @@ then
        Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";;
        # -u libsys_s pulls in all symbols in libsys
        Darwin/*)
-               # -u _PyMac_Error is needed to pull in the mac toolbox glue,
-               # which is
-               # not used by the core itself but which needs to be in the core so
-               # that dynamically loaded extension modules have access to it.
-               # -prebind is no longer used, because it actually seems to give a
-               # slowdown in stead of a speedup, maybe due to the large number of
-               # dynamic loads Python does.
-
                LINKFORSHARED="$extra_undefs -framework CoreFoundation"
                if test "$enable_framework"
                then

diff --git a/configure.in b/configure.in
index 557d11ef45abf90a13129ffccf73c62e47eb0ad6..8d0d0de89575de7206fd699f21cb2cc2880c34eb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -758,7 +758,7 @@ if test $SVNVERSION = found
 then
        SVNVERSION="svnversion \$(srcdir)"
 else
-       SVNVERSION="echo exported"
+       SVNVERSION="echo Unversioned directory"
 fi
 
 case $MACHDEP in