summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2015-11-04 17:23:24 +0000
committerJavier Jardón <jjardon@gnome.org>2016-02-08 12:44:37 +0000
commit6f878ff3dc60a9b7c7848807a57a64965323b42b (patch)
tree1d1490d3afeef0a7e9fe0eb00c65ecf3a257d5f1
parent9765f8ab9434ceb94f19ed670269851d13dec1e8 (diff)
downloaddefinitions-6f878ff3dc60a9b7c7848807a57a64965323b42b.tar.gz
Separate vala compiler in different stratum
Change-Id: I20c96502f910a31b7efa12a435685222c9980fb2
-rw-r--r--strata/gnome.morph15
-rw-r--r--strata/tools.morph13
-rw-r--r--strata/vala-common.morph32
-rw-r--r--strata/vala-common/vala-bootstrap.morph (renamed from strata/tools/vala-bootstrap.morph)0
-rw-r--r--systems/gnome-system-x86_64.morph2
5 files changed, 35 insertions, 27 deletions
diff --git a/strata/gnome.morph b/strata/gnome.morph
index 637196ed..5781ba07 100644
--- a/strata/gnome.morph
+++ b/strata/gnome.morph
@@ -4,7 +4,7 @@ description: GNOME stratum
build-depends:
- morph: strata/icu-common.morph
- morph: strata/input-common.morph
-- morph: strata/tools.morph
+- morph: strata/vala-common.morph
- morph: strata/gtk2.morph
- morph: strata/gtk3.morph
- morph: strata/audio-bluetooth.morph
@@ -372,18 +372,6 @@ chunks:
build-depends:
- iso-codes
build-system: autotools
-- name: m4-common
- repo: upstream:m4-common
- ref: 6e9a4d3b35c5ce8af050e66d8caff96070c57d34
- unpetrify-ref: baserock/2015-12-15
- build-system: autotools
-- name: libgee
- repo: upstream:gnome/libgee
- ref: 4301ab58efc217409c588a5527f68990b4e3d220
- unpetrify-ref: master
- build-depends:
- - m4-common
- build-system: autotools
- name: caribou
morph: strata/gnome/caribou.morph
repo: upstream:caribou
@@ -391,7 +379,6 @@ chunks:
unpetrify-ref: baserock/CARIBOU_0_4_19-1-ge1a7a24+python3
build-depends:
- clutter
- - libgee
- libxklavier
- name: libsecret
morph: strata/gnome/libsecret.morph
diff --git a/strata/tools.morph b/strata/tools.morph
index 9fc1f8c7..0a71acee 100644
--- a/strata/tools.morph
+++ b/strata/tools.morph
@@ -3,7 +3,6 @@ kind: stratum
description: Various tools
build-depends:
- morph: strata/core.morph
-- morph: strata/glib-common.morph
chunks:
- name: distcc
morph: strata/tools/distcc.morph
@@ -30,18 +29,6 @@ chunks:
ref: 6d8c0637e8dd0f65c667af33c612230552419db1
unpetrify-ref: v4.8
build-system: autotools
-- name: vala-bootstrap
- morph: strata/tools/vala-bootstrap.morph
- repo: upstream:vala
- ref: 4e4a02c03445336237b36723b23a91670ef7621b
- unpetrify-ref: baserock/bootstrap
-- name: vala
- repo: upstream:vala
- ref: 5f6ebe007050be12bdc4aa7c902ae4059f28874a
- unpetrify-ref: 0.28.0
- build-system: autotools
- build-depends:
- - vala-bootstrap
- name: u-boot
morph: strata/tools/u-boot.morph
repo: upstream:u-boot
diff --git a/strata/vala-common.morph b/strata/vala-common.morph
new file mode 100644
index 00000000..7827703c
--- /dev/null
+++ b/strata/vala-common.morph
@@ -0,0 +1,32 @@
+name: vala-common
+kind: stratum
+description: Vala compiler
+build-depends:
+- morph: strata/core.morph
+- morph: strata/glib-common.morph
+chunks:
+- name: vala-bootstrap
+ morph: strata/vala-common/vala-bootstrap.morph
+ repo: upstream:vala
+ ref: 4e4a02c03445336237b36723b23a91670ef7621b
+ unpetrify-ref: baserock/bootstrap
+- name: vala
+ repo: upstream:vala
+ ref: 5f6ebe007050be12bdc4aa7c902ae4059f28874a
+ unpetrify-ref: 0.28.0
+ build-system: autotools
+ build-depends:
+ - vala-bootstrap
+- name: m4-common
+ repo: upstream:m4-common
+ ref: 6e9a4d3b35c5ce8af050e66d8caff96070c57d34
+ unpetrify-ref: baserock/2015-12-15
+ build-system: autotools
+- name: libgee
+ repo: upstream:gnome/libgee
+ ref: 4301ab58efc217409c588a5527f68990b4e3d220
+ unpetrify-ref: master
+ build-system: autotools
+ build-depends:
+ - m4-common
+ - vala
diff --git a/strata/tools/vala-bootstrap.morph b/strata/vala-common/vala-bootstrap.morph
index e55b1887..e55b1887 100644
--- a/strata/tools/vala-bootstrap.morph
+++ b/strata/vala-common/vala-bootstrap.morph
diff --git a/systems/gnome-system-x86_64.morph b/systems/gnome-system-x86_64.morph
index 3166a486..4a88aaa2 100644
--- a/systems/gnome-system-x86_64.morph
+++ b/systems/gnome-system-x86_64.morph
@@ -49,6 +49,8 @@ strata:
morph: strata/tools.morph
- name: libdrm-common
morph: strata/libdrm-common.morph
+- name: vala-common
+ morph: strata/vala-common.morph
- name: wayland-generic
morph: strata/wayland-generic.morph
- name: weston-common