summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2013-03-26 12:41:29 +0000
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2013-03-26 12:41:29 +0000
commit6d0b51531a2db8ceebb78e945c0d0d10b0b8f554 (patch)
tree8699325706a016028560eac6a168389745efdafb
parentd02e0da31016f24c069d0b9ab2a2cfdf167ba0ff (diff)
parent5d56e10b3a9b6cd8c19062b01ac78f82457e2959 (diff)
downloadmorphs-6d0b51531a2db8ceebb78e945c0d0d10b0b8f554.tar.gz
Merge branch 'master' of git://git.baserock.org/baserock/baserock/morphs
-rw-r--r--core.morph15
1 files changed, 8 insertions, 7 deletions
diff --git a/core.morph b/core.morph
index a2c1bbf..8cc7e64 100644
--- a/core.morph
+++ b/core.morph
@@ -128,12 +128,19 @@
]
},
{
+ "name": "bzip2",
+ "repo": "upstream:bzip2",
+ "ref": "baserock/morph",
+ "build-depends": []
+ },
+ {
"name": "cpython",
"repo": "upstream:cpython",
"ref": "baserock/morph-2.7",
"build-depends": [
"openssl",
- "readline"
+ "readline",
+ "bzip2"
]
},
{
@@ -225,12 +232,6 @@
]
},
{
- "name": "bzip2",
- "repo": "upstream:bzip2",
- "ref": "baserock/morph",
- "build-depends": []
- },
- {
"name": "gperf",
"repo": "upstream:gperf",
"ref": "baserock/morph",