diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-03-14 10:59:46 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-03-14 19:11:48 +0000 |
| commit | 1f3c22493494b14760262be4782182ec67a59fa5 (patch) | |
| tree | dfe05ac29d7800cf066ee7b88e32f3b5c02788f1 /build-essential.morph.yaml | |
| parent | 7e69ba13132df002c166c4c6efb6e2568450c2b0 (diff) | |
| download | definitions-1f3c22493494b14760262be4782182ec67a59fa5.tar.gz | |
Add zlib to build-essential
It's never good to have multiple versions of the same library in use
on a system, so we should avoid using the versions of ZLib that are
bundled in the GCC and Binutils releases.
Diffstat (limited to 'build-essential.morph.yaml')
| -rw-r--r-- | build-essential.morph.yaml | 43 |
1 files changed, 42 insertions, 1 deletions
diff --git a/build-essential.morph.yaml b/build-essential.morph.yaml index e81d9ae5..79c6974f 100644 --- a/build-essential.morph.yaml +++ b/build-essential.morph.yaml @@ -52,6 +52,16 @@ chunks: - stage1-gcc - stage2-linux-api-headers + - name: stage2-zlib + repo: upstream:zlib + ref: baserock/samthursfield/build-essential-2-rebase + build-mode: bootstrap + prefix: /tools + build-depends: + - stage1-binutils + - stage1-gcc + - stage2-eglibc + - name: stage2-binutils repo: upstream:binutils-redhat ref: baserock/samthursfield/build-essential-2-rebase @@ -61,6 +71,7 @@ chunks: - stage1-binutils - stage1-gcc - stage2-eglibc + - stage2-zlib - name: stage2-gcc repo: upstream:gcc-tarball @@ -71,6 +82,7 @@ chunks: - stage1-binutils - stage1-gcc - stage2-eglibc + - stage2-zlib - name: stage2-busybox repo: upstream:busybox @@ -139,6 +151,7 @@ chunks: - stage2-gcc - stage2-linux-api-headers - stage2-make + - stage2-zlib - name: linux-api-headers repo: upstream:linux @@ -154,10 +167,11 @@ chunks: - stage2-gcc - stage2-linux-api-headers - stage2-make + - stage2-zlib - name: eglibc repo: upstream:eglibc2 - ref: baserock/2.15-build-essential + ref: baserock/samthursfield/build-essential-2-rebase build-mode: staging prefix: /usr build-depends: @@ -169,8 +183,26 @@ chunks: - stage2-gcc - stage2-linux-api-headers - stage2-make + - stage2-zlib - linux-api-headers + - name: zlib + repo: upstream:zlib + ref: baserock/samthursfield/build-essential-2-rebase + build-mode: staging + prefix: /usr + build-depends: + - stage2-binutils + - stage2-busybox + - stage2-eglibc + - stage2-fhs-dirs + - stage2-gawk + - stage2-gcc + - stage2-linux-api-headers + - stage2-make + - stage2-zlib + - eglibc + - name: binutils repo: upstream:binutils-redhat ref: baserock/samthursfield/build-essential-2-rebase @@ -185,7 +217,9 @@ chunks: - stage2-gcc - stage2-linux-api-headers - stage2-make + - stage2-zlib - eglibc + - zlib - name: busybox repo: upstream:busybox @@ -201,6 +235,7 @@ chunks: - stage2-gcc - stage2-linux-api-headers - stage2-make + - stage2-zlib - eglibc - name: gawk @@ -217,6 +252,7 @@ chunks: - stage2-gcc - stage2-linux-api-headers - stage2-make + - stage2-zlib - eglibc - name: gcc @@ -233,7 +269,9 @@ chunks: - stage2-gcc - stage2-linux-api-headers - stage2-make + - stage2-zlib - eglibc + - zlib - name: make repo: upstream:make @@ -249,6 +287,7 @@ chunks: - stage2-gcc - stage2-linux-api-headers - stage2-make + - stage2-zlib - eglibc # Extras that need to be in build-essential but don't need bootstrapping. @@ -267,4 +306,6 @@ chunks: - stage2-gcc - stage2-linux-api-headers - stage2-make + - stage2-zlib - eglibc + - zlib |