From 0f6eb4e0b91132e3eefa9b43b86b80892f323b84 Mon Sep 17 00:00:00 2001 From: Tiago Gomes Date: Tue, 23 Jun 2015 10:29:47 +0000 Subject: Add the clang compiler Change-Id: I623542335fa4a3444cf8fc500865f3847a7ec966 --- strata/compilers-extra.morph | 17 +++++++++++++++++ strata/compilers-extra/clang.morph | 10 ++++++++++ strata/compilers-extra/compiler-rt.morph | 10 ++++++++++ systems/devel-system-armv7-chroot.morph | 2 ++ systems/devel-system-armv7-highbank.morph | 2 ++ systems/devel-system-armv7-versatile.morph | 2 ++ systems/devel-system-armv7-wandboard.morph | 2 ++ systems/devel-system-armv7b-chroot.morph | 2 ++ systems/devel-system-armv7b-highbank.morph | 2 ++ systems/devel-system-armv7l-altera-socfpga-devkit.morph | 2 ++ systems/devel-system-armv7lhf-chroot.morph | 2 ++ systems/devel-system-armv7lhf-highbank.morph | 2 ++ systems/devel-system-armv7lhf-jetson.morph | 2 ++ systems/devel-system-armv7lhf-wandboard.morph | 2 ++ systems/devel-system-armv8b64.morph | 2 ++ systems/devel-system-armv8l64.morph | 2 ++ systems/devel-system-ppc64-chroot.morph | 2 ++ systems/devel-system-ppc64-generic.morph | 2 ++ systems/devel-system-x86_32-chroot.morph | 2 ++ systems/devel-system-x86_32-generic.morph | 2 ++ systems/devel-system-x86_64-chroot.morph | 2 ++ systems/devel-system-x86_64-generic.morph | 2 ++ systems/devel-system-x86_64-vagrant.morph | 2 ++ 23 files changed, 77 insertions(+) create mode 100644 strata/compilers-extra.morph create mode 100644 strata/compilers-extra/clang.morph create mode 100644 strata/compilers-extra/compiler-rt.morph diff --git a/strata/compilers-extra.morph b/strata/compilers-extra.morph new file mode 100644 index 00000000..e96be69e --- /dev/null +++ b/strata/compilers-extra.morph @@ -0,0 +1,17 @@ +name: compilers-extra +kind: stratum +description: | + Extra compilers in addition to the ones in build-essential +build-depends: +- morph: strata/llvm-common.morph +chunks: +- name: clang + morph: strata/compilers-extra/clang.morph + repo: upstream:clang + ref: 40b68b4c02b9d9e1e4138815747adf5589496240 + unpetrify-ref: release_37 +- name: compiler-rt + morph: strata/compilers-extra/compiler-rt.morph + repo: upstream:compiler-rt + ref: b5214093d4c91ed5352d35ee9126665fabfa97fe + unpetrify-ref: release_37 diff --git a/strata/compilers-extra/clang.morph b/strata/compilers-extra/clang.morph new file mode 100644 index 00000000..fb7c1ff6 --- /dev/null +++ b/strata/compilers-extra/clang.morph @@ -0,0 +1,10 @@ +name: clang +kind: chunk +build-system: cmake +configure-commands: +- mkdir o +- cd o && cmake -DCMAKE_INSTALL_PREFIX="$PREFIX" -DCMAKE_BUILD_TYPE=Release .. +build-commands: +- cd o && make +install-commands: +- cd o && make DESTDIR="$DESTDIR" install diff --git a/strata/compilers-extra/compiler-rt.morph b/strata/compilers-extra/compiler-rt.morph new file mode 100644 index 00000000..a1c9085b --- /dev/null +++ b/strata/compilers-extra/compiler-rt.morph @@ -0,0 +1,10 @@ +name: compiler-rt +kind: chunk +build-system: cmake +configure-commands: +- mkdir o +- cd o && cmake -DCMAKE_INSTALL_PREFIX="$PREFIX" -DCMAKE_BUILD_TYPE=Release .. +build-commands: +- cd o && make +install-commands: +- cd o && make DESTDIR="$DESTDIR" install diff --git a/systems/devel-system-armv7-chroot.morph b/systems/devel-system-armv7-chroot.morph index b93900cd..9a5f48f2 100644 --- a/systems/devel-system-armv7-chroot.morph +++ b/systems/devel-system-armv7-chroot.morph @@ -55,6 +55,8 @@ strata: morph: strata/ostree-core.morph - name: coreutils-common morph: strata/coreutils-common.morph +- name: compilers-extra + morph: strata/compilers-extra.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/devel-system-armv7-highbank.morph b/systems/devel-system-armv7-highbank.morph index b59efbd5..fd0cdfcb 100644 --- a/systems/devel-system-armv7-highbank.morph +++ b/systems/devel-system-armv7-highbank.morph @@ -58,6 +58,8 @@ strata: morph: strata/unionfs-fuse-group.morph - name: coreutils-common morph: strata/coreutils-common.morph +- name: compilers-extra + morph: strata/compilers-extra.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/devel-system-armv7-versatile.morph b/systems/devel-system-armv7-versatile.morph index 87c21e84..423648c9 100644 --- a/systems/devel-system-armv7-versatile.morph +++ b/systems/devel-system-armv7-versatile.morph @@ -56,6 +56,8 @@ strata: morph: strata/ostree-core.morph - name: coreutils-common morph: strata/coreutils-common.morph +- name: compilers-extra + morph: strata/compilers-extra.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/devel-system-armv7-wandboard.morph b/systems/devel-system-armv7-wandboard.morph index 7935bfbb..7e594710 100644 --- a/systems/devel-system-armv7-wandboard.morph +++ b/systems/devel-system-armv7-wandboard.morph @@ -56,6 +56,8 @@ strata: morph: strata/ostree-core.morph - name: coreutils-common morph: strata/coreutils-common.morph +- name: compilers-extra + morph: strata/compilers-extra.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/devel-system-armv7b-chroot.morph b/systems/devel-system-armv7b-chroot.morph index 17e20852..0c9344c1 100644 --- a/systems/devel-system-armv7b-chroot.morph +++ b/systems/devel-system-armv7b-chroot.morph @@ -47,6 +47,8 @@ strata: morph: strata/ostree-core.morph - name: coreutils-common morph: strata/coreutils-common.morph +- name: compilers-extra + morph: strata/compilers-extra.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/devel-system-armv7b-highbank.morph b/systems/devel-system-armv7b-highbank.morph index a632087d..4bd34876 100644 --- a/systems/devel-system-armv7b-highbank.morph +++ b/systems/devel-system-armv7b-highbank.morph @@ -54,6 +54,8 @@ strata: morph: strata/unionfs-fuse-group.morph - name: coreutils-common morph: strata/coreutils-common.morph +- name: compilers-extra + morph: strata/compilers-extra.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/devel-system-armv7l-altera-socfpga-devkit.morph b/systems/devel-system-armv7l-altera-socfpga-devkit.morph index ab8f6bf1..94f85ec2 100644 --- a/systems/devel-system-armv7l-altera-socfpga-devkit.morph +++ b/systems/devel-system-armv7l-altera-socfpga-devkit.morph @@ -51,6 +51,8 @@ strata: morph: strata/libsoup-common.morph - name: ostree-core morph: strata/ostree-core.morph +- name: compilers-extra + morph: strata/compilers-extra.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/devel-system-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot.morph index a5065d6e..203d5ef8 100644 --- a/systems/devel-system-armv7lhf-chroot.morph +++ b/systems/devel-system-armv7lhf-chroot.morph @@ -55,6 +55,8 @@ strata: morph: strata/ostree-core.morph - name: coreutils-common morph: strata/coreutils-common.morph +- name: compilers-extra + morph: strata/compilers-extra.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/devel-system-armv7lhf-highbank.morph b/systems/devel-system-armv7lhf-highbank.morph index 95feecb2..c0ccfa66 100644 --- a/systems/devel-system-armv7lhf-highbank.morph +++ b/systems/devel-system-armv7lhf-highbank.morph @@ -61,6 +61,8 @@ strata: morph: strata/unionfs-fuse-group.morph - name: coreutils-common morph: strata/coreutils-common.morph +- name: compilers-extra + morph: strata/compilers-extra.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph index e4e7a717..14bc1b27 100644 --- a/systems/devel-system-armv7lhf-jetson.morph +++ b/systems/devel-system-armv7lhf-jetson.morph @@ -59,6 +59,8 @@ strata: morph: strata/ostree-core.morph - name: coreutils-common morph: strata/coreutils-common.morph +- name: compilers-extra + morph: strata/compilers-extra.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/devel-system-armv7lhf-wandboard.morph b/systems/devel-system-armv7lhf-wandboard.morph index 7f99d234..6cf81846 100644 --- a/systems/devel-system-armv7lhf-wandboard.morph +++ b/systems/devel-system-armv7lhf-wandboard.morph @@ -59,6 +59,8 @@ strata: morph: strata/ostree-core.morph - name: coreutils-common morph: strata/coreutils-common.morph +- name: compilers-extra + morph: strata/compilers-extra.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/devel-system-armv8b64.morph b/systems/devel-system-armv8b64.morph index 17cf9c72..ab8dcd1b 100644 --- a/systems/devel-system-armv8b64.morph +++ b/systems/devel-system-armv8b64.morph @@ -58,6 +58,8 @@ strata: morph: strata/ostree-core.morph - name: coreutils-common morph: strata/coreutils-common.morph +- name: compilers-extra + morph: strata/compilers-extra.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/devel-system-armv8l64.morph b/systems/devel-system-armv8l64.morph index c08fcd49..3cf21388 100644 --- a/systems/devel-system-armv8l64.morph +++ b/systems/devel-system-armv8l64.morph @@ -58,6 +58,8 @@ strata: morph: strata/ostree-core.morph - name: coreutils-common morph: strata/coreutils-common.morph +- name: compilers-extra + morph: strata/compilers-extra.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/devel-system-ppc64-chroot.morph b/systems/devel-system-ppc64-chroot.morph index e4ade5e8..5e4c5f98 100644 --- a/systems/devel-system-ppc64-chroot.morph +++ b/systems/devel-system-ppc64-chroot.morph @@ -53,6 +53,8 @@ strata: morph: strata/ostree-core.morph - name: coreutils-common morph: strata/coreutils-common.morph +- name: compilers-extra + morph: strata/compilers-extra.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/devel-system-ppc64-generic.morph b/systems/devel-system-ppc64-generic.morph index 74e27416..be76353c 100644 --- a/systems/devel-system-ppc64-generic.morph +++ b/systems/devel-system-ppc64-generic.morph @@ -56,6 +56,8 @@ strata: morph: strata/ostree-core.morph - name: coreutils-common morph: strata/coreutils-common.morph +- name: compilers-extra + morph: strata/compilers-extra.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/devel-system-x86_32-chroot.morph b/systems/devel-system-x86_32-chroot.morph index 55d41b12..bcd0acfc 100644 --- a/systems/devel-system-x86_32-chroot.morph +++ b/systems/devel-system-x86_32-chroot.morph @@ -55,6 +55,8 @@ strata: morph: strata/ostree-core.morph - name: coreutils-common morph: strata/coreutils-common.morph +- name: compilers-extra + morph: strata/compilers-extra.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/devel-system-x86_32-generic.morph b/systems/devel-system-x86_32-generic.morph index 3e2abab2..c03c8b73 100644 --- a/systems/devel-system-x86_32-generic.morph +++ b/systems/devel-system-x86_32-generic.morph @@ -60,6 +60,8 @@ strata: morph: strata/ostree-core.morph - name: coreutils-common morph: strata/coreutils-common.morph +- name: compilers-extra + morph: strata/compilers-extra.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/devel-system-x86_64-chroot.morph b/systems/devel-system-x86_64-chroot.morph index b55988c3..49fc75af 100644 --- a/systems/devel-system-x86_64-chroot.morph +++ b/systems/devel-system-x86_64-chroot.morph @@ -57,6 +57,8 @@ strata: morph: strata/ostree-core.morph - name: coreutils-common morph: strata/coreutils-common.morph +- name: compilers-extra + morph: strata/compilers-extra.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph index ad4a87d6..5ee32cc2 100644 --- a/systems/devel-system-x86_64-generic.morph +++ b/systems/devel-system-x86_64-generic.morph @@ -60,6 +60,8 @@ strata: morph: strata/ostree-core.morph - name: coreutils-common morph: strata/coreutils-common.morph +- name: compilers-extra + morph: strata/compilers-extra.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph index 58dcf2bc..e142c7c5 100644 --- a/systems/devel-system-x86_64-vagrant.morph +++ b/systems/devel-system-x86_64-vagrant.morph @@ -58,6 +58,8 @@ strata: morph: strata/ostree-core.morph - name: coreutils-common morph: strata/coreutils-common.morph +- name: compilers-extra + morph: strata/compilers-extra.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files -- cgit v1.2.1