Commit e6aa39a2 authored by Marius Gedminas's avatar Marius Gedminas

Fix Python 2.6 builds

The SSL patch file was recently renamed[1], and then fixed to apply
against 2.6.9rc1[2].

[1] https://github.com/collective/buildout.python/commit/ad45adb78bfa37542d62a394392d5146fce5af34
[2] https://github.com/collective/buildout.python/commit/8d58e4b2bc67ef67d97013a66e8aa4669b3a37a1

Since buildout is still building Python 2.6.8 we should use a URL to a
version of the patch that applies to 2.6.8.

I noticed this problem while idly browsing Travis CI:
https://travis-ci.org/buildout/buildout/jobs/12570074
parent 08c34b84
......@@ -31,9 +31,9 @@ $(PYTHON_PATH):
curl --progress-bar $(PYTHON_DOWNLOAD) | tar -zx
ifeq ($(PYTHON_VER),2.6)
cd $(PYTHON_PATH) && \
curl --progress-bar https://raw.github.com/collective/buildout.python/master/src/issue12012-sslv2-py26.txt > ssl.txt
curl --progress-bar https://raw.github.com/collective/buildout.python/ad45adb78bfa37542d62a394392d5146fce5af34/src/issue12012-sslv2-py26.patch > ssl.patch
cd $(PYTHON_PATH)/$(PYTHON_ARCHIVE) && \
patch -p0 < ../ssl.txt
patch -p0 < ../ssl.patch
endif
cd $(PYTHON_PATH)/$(PYTHON_ARCHIVE) && \
./configure --prefix $(PYTHON_PATH) >/dev/null 2>&1 && \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment