Skip to content

S
slapos.buildout
Commit dac64121 authored by Marius Gedminas's avatar Marius Gedminas
Browse files
Options

Merge pull request #179 from tmckay/fix-makefile 

Fix Python tarball download in Makefile by following HTTP redirects
parents 7ce1c6b2 8b476ebc
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
Makefile
View file @ dac64121
...@@ -16,7 +16,7 @@ ifeq ($(PYTHON_VER),3.3) ...@@ -16,7 +16,7 @@ ifeq ($(PYTHON_VER),3.3)
endif endif
PYTHON_ARCHIVE ?= Python-$(PYTHON_MINOR) PYTHON_ARCHIVE ?= Python-$(PYTHON_MINOR)
PYTHON_DOWNLOAD = http://www.python.org/ftp/python/$(PYTHON_MINOR)/$(PYTHON_ARCHIVE).tgz PYTHON_DOWNLOAD = https://www.python.org/ftp/python/$(PYTHON_MINOR)/$(PYTHON_ARCHIVE).tgz
PYTHON_EXE = python$(PYTHON_VER) PYTHON_EXE = python$(PYTHON_VER)
.PHONY: all build test .PHONY: all build test
...@@ -28,7 +28,7 @@ $(PYTHON_PATH): ...@@ -28,7 +28,7 @@ $(PYTHON_PATH):
@echo "Installing Python" @echo "Installing Python"
mkdir -p $(PYTHON_PATH) mkdir -p $(PYTHON_PATH)
cd $(PYTHON_PATH) && \ cd $(PYTHON_PATH) && \
curl --progress-bar $(PYTHON_DOWNLOAD) | tar -zx curl --progress-bar --location $(PYTHON_DOWNLOAD) | tar -zx
ifeq ($(PYTHON_VER),2.6) ifeq ($(PYTHON_VER),2.6)
cd $(PYTHON_PATH) && \ cd $(PYTHON_PATH) && \
curl --progress-bar https://raw.github.com/collective/buildout.python/ad45adb78bfa37542d62a394392d5146fce5af34/src/issue12012-sslv2-py26.patch > ssl.patch curl --progress-bar https://raw.github.com/collective/buildout.python/ad45adb78bfa37542d62a394392d5146fce5af34/src/issue12012-sslv2-py26.patch > ssl.patch
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7