From 2cc968846977e298a8e9cadfb5a4cb4010cc1d1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Thu, 25 Sep 2014 10:22:23 +0000 Subject: Move llvm to its own stratum llvm is a bif piece of software that take long time to build With this move we will only build it when its really necessary --- strata/llvm-common.morph | 11 +++++++++++ strata/llvm-common/llvm.morph | 8 ++++++++ strata/mesa-common.morph | 1 + strata/x-common.morph | 8 +------- strata/x-common/llvm.morph | 8 -------- systems/genivi-baseline-system-x86_64-generic.morph | 2 ++ 6 files changed, 23 insertions(+), 15 deletions(-) create mode 100644 strata/llvm-common.morph create mode 100644 strata/llvm-common/llvm.morph delete mode 100644 strata/x-common/llvm.morph diff --git a/strata/llvm-common.morph b/strata/llvm-common.morph new file mode 100644 index 00000000..0fdb9e8b --- /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: 60aa15443579a9542a1e8818f3c5dd901edb03d9 + unpetrify-ref: baserock/morph + build-depends: [] diff --git a/strata/llvm-common/llvm.morph b/strata/llvm-common/llvm.morph new file mode 100644 index 00000000..fed29165 --- /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" --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/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 -- cgit v1.2.1 From b0d0f725272317372b2e3d61c47b13c55da2af17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Thu, 2 Oct 2014 10:51:47 +0000 Subject: strata/llvm-common.morph: Update llvm to latest 3.3.x version Seems 3.4.2 and 3.5.1 doesnt compile in ARM --- strata/llvm-common.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/llvm-common.morph b/strata/llvm-common.morph index 0fdb9e8b..243461d6 100644 --- a/strata/llvm-common.morph +++ b/strata/llvm-common.morph @@ -6,6 +6,6 @@ chunks: - name: llvm morph: strata/llvm-common/llvm.morph repo: upstream:llvm - ref: 60aa15443579a9542a1e8818f3c5dd901edb03d9 - unpetrify-ref: baserock/morph + ref: a93239b7c6f0d78cb8836768c3ffbc39fb15b79f + unpetrify-ref: release_33 build-depends: [] -- cgit v1.2.1 From 211ba92b6c2a3c8863c1028ea2ca85e2dcd407ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Thu, 2 Oct 2014 10:54:36 +0000 Subject: llvm.morph: Compile the default options with some exceptions --disable-assertions: those checks are not needed in production systems --enable-optimized: it will help compiling on ARM --enable-shared: mesa recommends llvm to be compiled in this way --enable-targets=host: Only build for the host architecture See http://llvm.org/docs/GettingStarted.html#local-llvm-configuration and http://llvm.org/docs/HowToBuildOnARM.html --- strata/llvm-common/llvm.morph | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/strata/llvm-common/llvm.morph b/strata/llvm-common/llvm.morph index fed29165..9d280062 100644 --- a/strata/llvm-common/llvm.morph +++ b/strata/llvm-common/llvm.morph @@ -3,6 +3,6 @@ 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 +- ./configure --prefix="$PREFIX" --sysconfdir=/etc --enable-shared --enable-targets=host --enable-optimized --disable-assertions +build-commands: +- make $MAKEFLAGS -- cgit v1.2.1