mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 03:35:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 72871-72872 via svnmerge from

Browse source 
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
........
This commit is contained in:
Benjamin Peterson 2009-05-23 19:36:27 +00:00
parent 716c444edc
commit f53eec8801
7 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile.pre.in
View file

@ -524,7 +524,7 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \
$(SIGNAL_OBJS) \ $(SIGNAL_OBJS) \
$(MODOBJS) \ $(MODOBJS) \
$(srcdir)/Modules/getbuildinfo.c $(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 Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile
$(CC) -c $(PY_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \ $(CC) -c $(PY_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \

1
Misc/ACKS
View file

@ -709,6 +709,7 @@ Kalle Svensson
Andrew Svetlov Andrew Svetlov
Paul Swartz Paul Swartz
Thenault Sylvain Thenault Sylvain
Arfrever Frehtes Taifersar Arahesis
Geoff Talvola Geoff Talvola
Musashi Tamura Musashi Tamura
William Tanksley William Tanksley

2
Misc/NEWS
View file

@ -1081,6 +1081,8 @@ Tools/Demos
Build Build
----- -----
- Issue #6094: Build correctly with Subversion 1.7.
- Issue #5847: Remove -n switch on "Edit with IDLE" menu item. - 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 - Issue #5726: Make Modules/ld_so_aix return the actual exit code of the

2
Modules/getbuildinfo.c
View file

@ -48,5 +48,5 @@ _Py_svnversion(void)
static const char svnversion[] = SVNVERSION; static const char svnversion[] = SVNVERSION;
if (svnversion[0] != '$') if (svnversion[0] != '$')
return svnversion; /* it was interpolated, or passed on command line */ return svnversion; /* it was interpolated, or passed on command line */
return "exported"; return "Unversioned directory";
} }

2
Python/sysmodule.c
View file

@ -1115,7 +1115,7 @@ svnversion_init(void)
svnversion = _Py_svnversion(); svnversion = _Py_svnversion();
if (strcmp(svnversion, "exported") != 0) if (strcmp(svnversion, "Unversioned directory") != 0 && strcmp(svnversion, "exported") != 0)
svn_revision = svnversion; svn_revision = svnversion;
else if (istag) { else if (istag) {
len = strlen(_patchlevel_revision); len = strlen(_patchlevel_revision);

12
configure vendored
View file

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Revision: 72800 . # From configure.in Revision: 72865 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for python 3.1. # Generated by GNU Autoconf 2.61 for python 3.1.
# #
@ -4333,7 +4333,7 @@ if test $SVNVERSION = found
then then
SVNVERSION="svnversion \$(srcdir)" SVNVERSION="svnversion \$(srcdir)"
else else
SVNVERSION="echo exported" SVNVERSION="echo Unversioned directory"
fi fi
case $MACHDEP in case $MACHDEP in
@ -13516,14 +13516,6 @@ then
Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";; Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";;
# -u libsys_s pulls in all symbols in libsys # -u libsys_s pulls in all symbols in libsys
Darwin/*) 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" LINKFORSHARED="$extra_undefs -framework CoreFoundation"
if test "$enable_framework" if test "$enable_framework"
then then

2
configure.in
View file

@ -758,7 +758,7 @@ if test $SVNVERSION = found
then then
SVNVERSION="svnversion \$(srcdir)" SVNVERSION="svnversion \$(srcdir)"
else else
SVNVERSION="echo exported" SVNVERSION="echo Unversioned directory"
fi fi
case $MACHDEP in case $MACHDEP in