summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2013-09-24 12:28:57 +0000
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2013-09-24 12:28:57 +0000
commit127844d57f94da35a179fb366fafec0e6b69d8eb (patch)
tree0fefb3ff57f83cce2e94c0d3e50f0808d4ec0a61
parentf2883cd690851b3a39f735250b566a78c119c199 (diff)
parentaaf2e6d488bc3df2fac9f2751e50a314a83f67e7 (diff)
downloaddefinitions-127844d57f94da35a179fb366fafec0e6b69d8eb.tar.gz
Merge branch 'baserock/liw/S8699-openssl-git-repo'
Reviewed-by: Richard Maw (on irc) Reviewed-by: Daniel Silverstone (on irc)
-rw-r--r--core.morph10
1 files changed, 5 insertions, 5 deletions
diff --git a/core.morph b/core.morph
index a76aa11a..80aa3e72 100644
--- a/core.morph
+++ b/core.morph
@@ -72,8 +72,8 @@ chunks:
ref: baserock/build-essential
build-depends:
- m4
-- name: openssl
- repo: upstream:openssl
+- name: openssl-new
+ repo: upstream:openssl-new
ref: baserock/morph
build-depends:
- perl
@@ -85,7 +85,7 @@ chunks:
repo: upstream:cpython
ref: baserock/morph-2.7
build-depends:
- - openssl
+ - openssl-new
- bzip2
- name: libtool
repo: upstream:libtool
@@ -114,7 +114,7 @@ chunks:
- autoconf
- automake
- libtool
- - openssl
+ - openssl-new
- name: libexpat
repo: upstream:libexpat
ref: baserock/morph
@@ -139,7 +139,7 @@ chunks:
- error-perl-tarball
- gettext
- libexpat
- - openssl
+ - openssl-new
- name: bison
repo: upstream:bison
ref: baserock/morph