summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Thomas <james.thomas@codethink.co.uk>2014-10-10 19:23:34 (GMT)
committerJames Thomas <james.thomas@codethink.co.uk>2014-10-10 19:23:34 (GMT)
commit0f70823bbc40ba58b7bb746d3747b7f0318c799b (patch)
treebc86d7c8611cbf376ee3db41e65a0d22645a3b1a
parent27e95cdd98062f2464b2a7f372402f75aab7f497 (diff)
parentf26dd579bf8ef44f4c0878bb01708c4671142b2d (diff)
downloaddefinitions-0f70823bbc40ba58b7bb746d3747b7f0318c799b.tar.gz
Merge remote-tracking branch 'origin/jjardon/libdrm' into jjardon/gnome
Conflicts: strata/libdrm-common.morph strata/mesa-common.morph strata/x-generic.morph
-rw-r--r--strata/mesa-common.morph9
-rw-r--r--strata/mesa-common/llvm.morph8
2 files changed, 16 insertions, 1 deletions
diff --git a/strata/mesa-common.morph b/strata/mesa-common.morph
index e2548e7..7702a36 100644
--- a/strata/mesa-common.morph
+++ b/strata/mesa-common.morph
@@ -5,9 +5,16 @@ build-depends:
- morph: strata/libdrm-common.morph
- morph: strata/wayland-generic.morph
chunks:
+- name: llvm
+ morph: strata/mesa-common/llvm.morph
+ repo: upstream:llvm
+ ref: df820bfd87d7d70d8f1a739333496e191631a3e2
+ unpetrify-ref: release_35
+ 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 0000000..c967c06
--- /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" --disable-assertions --enable-optimized --enable-shared
+build-commands:
+- make $MAKEFLAGS