Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.buildout
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Xavier Thompson
slapos.buildout
Commits
dac64121
Commit
dac64121
authored
Mar 22, 2014
by
Marius Gedminas
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #179 from tmckay/fix-makefile
Fix Python tarball download in Makefile by following HTTP redirects
parents
7ce1c6b2
8b476ebc
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
Makefile
Makefile
+2
-2
No files found.
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
=
http
s
://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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment