summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2012-08-22 11:11:47 +0100
committerRichard Maw <richard.maw@codethink.co.uk>2012-08-22 11:11:47 +0100
commit85f4b00b34f0a7e38133be8f83ca16db8a3cfc62 (patch)
tree38362ea21bbd2b2cbe98de53f58f92851066e485
parent52d14f13d60e56884e12039caf8cd017f1d517b0 (diff)
parent4a6246bf19860d9d314f2d4587291c461a8db14e (diff)
downloadmorphs-85f4b00b34f0a7e38133be8f83ca16db8a3cfc62.tar.gz
Merge branch 'samthursfield/vala' of git://git.baserock.org/baserock/morphs
-rw-r--r--bootstrap-pass2.morph8
-rw-r--r--devel.morph10
2 files changed, 18 insertions, 0 deletions
diff --git a/bootstrap-pass2.morph b/bootstrap-pass2.morph
index 95ec0b5..0845d27 100644
--- a/bootstrap-pass2.morph
+++ b/bootstrap-pass2.morph
@@ -284,6 +284,14 @@
"openssl",
"libexpat"
]
+ },
+ {
+ "name": "vala",
+ "repo": "upstream:vala",
+ "ref": "baserock/bootstrap",
+ "build-depends": [
+ "glib"
+ ]
}
]
}
diff --git a/devel.morph b/devel.morph
index d97b949..4899886 100644
--- a/devel.morph
+++ b/devel.morph
@@ -365,6 +365,16 @@
"repo": "upstream:strace",
"ref": "master",
"build-depends": [ "make" ]
+ },
+ {
+ "name": "vala",
+ "repo": "upstream:vala",
+ "ref": "master",
+ "build-depends": [
+ "autoconf",
+ "automake",
+ "make"
+ ]
}
]
}