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 | |
| 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')
| -rw-r--r-- | build-essential.morph | 61 |
1 files changed, 53 insertions, 8 deletions
diff --git a/build-essential.morph b/build-essential.morph index 49843af6..c8c9413a 100644 --- a/build-essential.morph +++ b/build-essential.morph @@ -45,6 +45,18 @@ ] }, { + "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", @@ -53,7 +65,8 @@ "build-depends": [ "stage1-binutils", "stage1-gcc", - "stage2-eglibc" + "stage2-eglibc", + "stage2-zlib" ] }, { @@ -65,7 +78,8 @@ "build-depends": [ "stage1-binutils", "stage1-gcc", - "stage2-eglibc" + "stage2-eglibc", + "stage2-zlib" ] }, { @@ -126,7 +140,8 @@ "stage2-gawk", "stage2-gcc", "stage2-linux-api-headers", - "stage2-make" + "stage2-make", + "stage2-zlib" ] }, { @@ -143,13 +158,14 @@ "stage2-gawk", "stage2-gcc", "stage2-linux-api-headers", - "stage2-make" + "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": [ @@ -161,10 +177,30 @@ "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", @@ -179,7 +215,9 @@ "stage2-gcc", "stage2-linux-api-headers", "stage2-make", - "eglibc" + "stage2-zlib", + "eglibc", + "zlib" ] }, { @@ -197,6 +235,7 @@ "stage2-gcc", "stage2-linux-api-headers", "stage2-make", + "stage2-zlib", "eglibc" ] }, @@ -215,6 +254,7 @@ "stage2-gcc", "stage2-linux-api-headers", "stage2-make", + "stage2-zlib", "eglibc" ] }, @@ -233,7 +273,9 @@ "stage2-gcc", "stage2-linux-api-headers", "stage2-make", - "eglibc" + "stage2-zlib", + "eglibc", + "zlib" ] }, { @@ -251,6 +293,7 @@ "stage2-gcc", "stage2-linux-api-headers", "stage2-make", + "stage2-zlib", "eglibc" ] }, @@ -269,7 +312,9 @@ "stage2-gcc", "stage2-linux-api-headers", "stage2-make", - "eglibc" + "stage2-zlib", + "eglibc", + "zlib" ] } ] |