From fd36185243b064292ca576e0ad7bd1b3f8e6c472 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 25 Sep 2014 10:22:23 +0000
Subject: Move llvm to mesa-common

---
 strata/mesa-common.morph      | 9 ++++++++-
 strata/mesa-common/llvm.morph | 8 ++++++++
 strata/x-common.morph         | 8 +-------
 strata/x-common/llvm.morph    | 8 --------
 4 files changed, 17 insertions(+), 16 deletions(-)
 create mode 100644 strata/mesa-common/llvm.morph
 delete mode 100644 strata/x-common/llvm.morph

(limited to 'strata')

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/mesa-common/llvm.morph b/strata/mesa-common/llvm.morph
new file mode 100644
index 00000000..fed29165
--- /dev/null
+++ b/strata/mesa-common/llvm.morph
@@ -0,0 +1,8 @@
+name: llvm
+kind: chunk
+description: Low Level Virtual Machine
+build-system: autotools
+configure-commands:
+- ./configure --prefix="$PREFIX" --libdir="$PREFIX"/lib/llvm --sysconfdir=/etc --enable-shared
+  --enable-libffi --enable-targets=all --disable-expensive-checks --disable-debug-runtime
+  --disable-assertions --enable-optimized
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
diff --git a/strata/x-common/llvm.morph b/strata/x-common/llvm.morph
deleted file mode 100644
index fed29165..00000000
--- a/strata/x-common/llvm.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: llvm
-kind: chunk
-description: Low Level Virtual Machine
-build-system: autotools
-configure-commands:
-- ./configure --prefix="$PREFIX" --libdir="$PREFIX"/lib/llvm --sysconfdir=/etc --enable-shared
-  --enable-libffi --enable-targets=all --disable-expensive-checks --disable-debug-runtime
-  --disable-assertions --enable-optimized
-- 
cgit v1.2.1