diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-05-17 22:49:33 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-05-18 16:33:19 +0200 |
| commit | 7e5a6a385051569da1bf872989aef262f2d802e2 (patch) | |
| tree | 00dc295d49ddf30fc419cb080857f039df17eff5 /python | |
| parent | 9455c44d3f43d17b1d9150a1cd6c6f34e696c6ed (diff) | |
python: svn 1.7 breaks the build because...
... the output of "svninfo" in a directory that doesn't contain a .svn
changed
Change-Id: I16b132663a7c8d9fd60eafafecfc7f9e82b69b29
Diffstat (limited to 'python')
| -rw-r--r-- | python/Python-2.6.1-svn-1.7.patch | 12 | ||||
| -rw-r--r-- | python/makefile.mk | 3 |
2 files changed, 14 insertions, 1 deletions
diff --git a/python/Python-2.6.1-svn-1.7.patch b/python/Python-2.6.1-svn-1.7.patch new file mode 100644 index 000000000000..b3d00149cec2 --- /dev/null +++ b/python/Python-2.6.1-svn-1.7.patch @@ -0,0 +1,12 @@ +--- misc/build/Python-2.6.1/Makefile.pre.in 2012-05-17 22:05:39.445274789 +0200 ++++ misc/build.new/Python-2.6.1/Makefile.pre.in 2012-05-17 22:05:15.214276225 +0200 +@@ -34,7 +34,8 @@ + LINKCC= @LINKCC@ + AR= @AR@ + RANLIB= @RANLIB@ +-SVNVERSION= @SVNVERSION@ ++# svnversion 1.7 changed its output from "exported" to "Unversioned directory" ++SVNVERSION="echo exported" + + # Shell used by make (some versions default to the login shell, which is bad) + SHELL= /bin/sh diff --git a/python/makefile.mk b/python/makefile.mk index 874fd4ff2a96..1abe10017fc5 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -57,7 +57,8 @@ PATCH_FILES=\ Python-2.6.1-sysbase.patch \ Python-2.6.1-nohardlink.patch \ Python-2.6.1-py2422.patch \ - Python-2.6.1-py4768.patch + Python-2.6.1-py4768.patch \ + Python-2.6.1-svn-1.7.patch \ CONFIGURE_DIR= |