summaryrefslogtreecommitdiff
path: root/strata
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2014-09-25 10:22:23 +0000
committerJavier Jardón <jjardon@gnome.org>2014-09-25 19:45:07 +0100
commitfd36185243b064292ca576e0ad7bd1b3f8e6c472 (patch)
treeab3f00e4fc285c812529226f9d17e82074ac0b4f /strata
parentdfcf9cf1a842d4974237b6963b79f5a031d7996f (diff)
downloaddefinitions-fd36185243b064292ca576e0ad7bd1b3f8e6c472.tar.gz
Move llvm to mesa-common
Diffstat (limited to 'strata')
-rw-r--r--strata/mesa-common.morph9
-rw-r--r--strata/mesa-common/llvm.morph (renamed from strata/x-common/llvm.morph)0
-rw-r--r--strata/x-common.morph8
3 files changed, 9 insertions, 8 deletions
diff --git a/strata/mesa-common.morph b/strata/mesa-common.morph
index 6a84aa8e..770f2fb7 100644
--- a/strata/mesa-common.morph
+++ b/strata/mesa-common.morph
@@ -4,9 +4,16 @@ build-depends:
- morph: strata/x-common.morph
- morph: strata/wayland-generic.morph
chunks:
+- name: llvm
+ morph: strata/mesa-common/llvm.morph
+ repo: upstream:llvm
+ ref: 60aa15443579a9542a1e8818f3c5dd901edb03d9
+ unpetrify-ref: baserock/morph
+ build-depends: []
- name: mesa
morph: strata/mesa-common/mesa.morph
repo: upstream:mesa
ref: 1b12af300dfa77c24088780e88200703653293d3
unpetrify-ref: mesa-10.3
- build-depends: []
+ build-depends:
+ - llvm
diff --git a/strata/x-common/llvm.morph b/strata/mesa-common/llvm.morph
index fed29165..fed29165 100644
--- a/strata/x-common/llvm.morph
+++ b/strata/mesa-common/llvm.morph
diff --git a/strata/x-common.morph b/strata/x-common.morph
index 987862a9..e9ae0b01 100644
--- a/strata/x-common.morph
+++ b/strata/x-common.morph
@@ -1,14 +1,8 @@
name: x-common
kind: stratum
build-depends:
-- morph: strata/foundation.morph
+- morph: strata/core.morph
chunks:
-- name: llvm
- morph: strata/x-common/llvm.morph
- repo: upstream:llvm
- ref: 60aa15443579a9542a1e8818f3c5dd901edb03d9
- unpetrify-ref: baserock/morph
- build-depends: []
- name: xorg-util-macros
repo: upstream:xorg-util-macros
ref: 9a54b858601bd305de2737b06e609084a2a114c2