summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2014-10-09 14:54:14 +0100
committerJavier Jardón <jjardon@gnome.org>2014-10-09 14:59:34 +0100
commit2c309cffa618808f5f0d871616cfb76d729713c0 (patch)
tree80208c44481aeea9184d77f8d0eb0155776ccadd
parentace9d6a8c46f9d9cedbc8e7f025ccd4c8a1e89d9 (diff)
parent211ba92b6c2a3c8863c1028ea2ca85e2dcd407ce (diff)
downloaddefinitions-2c309cffa618808f5f0d871616cfb76d729713c0.tar.gz
Merge branch 'baserock/jjardon/llvm_33'
Reviewed-By: Paul Sherwood <paul.sherwood@codethink.co.uk> Reviewed-By: Richard Maw <richard.maw@gmail.com>
-rw-r--r--strata/llvm-common.morph11
-rw-r--r--strata/llvm-common/llvm.morph8
-rw-r--r--strata/mesa-common.morph1
-rw-r--r--strata/x-common.morph8
-rw-r--r--strata/x-common/llvm.morph8
-rw-r--r--systems/genivi-baseline-system-x86_64-generic.morph2
6 files changed, 23 insertions, 15 deletions
diff --git a/strata/llvm-common.morph b/strata/llvm-common.morph
new file mode 100644
index 00000000..243461d6
--- /dev/null
+++ b/strata/llvm-common.morph
@@ -0,0 +1,11 @@
+name: llvm-common
+kind: stratum
+build-depends:
+- morph: strata/core.morph
+chunks:
+- name: llvm
+ morph: strata/llvm-common/llvm.morph
+ repo: upstream:llvm
+ ref: a93239b7c6f0d78cb8836768c3ffbc39fb15b79f
+ unpetrify-ref: release_33
+ build-depends: []
diff --git a/strata/llvm-common/llvm.morph b/strata/llvm-common/llvm.morph
new file mode 100644
index 00000000..9d280062
--- /dev/null
+++ b/strata/llvm-common/llvm.morph
@@ -0,0 +1,8 @@
+name: llvm
+kind: chunk
+description: Low Level Virtual Machine
+build-system: autotools
+configure-commands:
+- ./configure --prefix="$PREFIX" --sysconfdir=/etc --enable-shared --enable-targets=host --enable-optimized --disable-assertions
+build-commands:
+- make $MAKEFLAGS
diff --git a/strata/mesa-common.morph b/strata/mesa-common.morph
index 6a84aa8e..d4c23bcd 100644
--- a/strata/mesa-common.morph
+++ b/strata/mesa-common.morph
@@ -1,6 +1,7 @@
name: mesa-common
kind: stratum
build-depends:
+- morph: strata/llvm-common.morph
- morph: strata/x-common.morph
- morph: strata/wayland-generic.morph
chunks:
diff --git a/strata/x-common.morph b/strata/x-common.morph
index 9acb4bf0..bb0affe9 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
diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph
index d1f479d9..e7a37ff9 100644
--- a/systems/genivi-baseline-system-x86_64-generic.morph
+++ b/systems/genivi-baseline-system-x86_64-generic.morph
@@ -31,6 +31,8 @@ strata:
morph: strata/graphics-common.morph
- name: input-common
morph: strata/input-common.morph
+- name: llvm-common
+ morph: strata/llvm-common.morph
- name: mesa-common
morph: strata/mesa-common.morph
- name: weston-genivi