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.

3 files changed, 97 insertions, 19 deletions

diff --git a/build-essential.morph b/build-essential.morph
index 49843af..c8c9413 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"
             ]
         }
     ]
diff --git a/build-essential.morph.yaml b/build-essential.morph.yaml
index e81d9ae..79c6974 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
diff --git a/core.morph b/core.morph
index 14c144d..eb99e69 100644
--- a/core.morph
+++ b/core.morph
@@ -77,12 +77,6 @@
             ]
         },
         {
-            "name": "zlib",
-            "repo": "upstream:zlib",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
             "name": "autoconf",
             "repo": "upstream:autoconf",
             "ref": "baserock/build-essential",
@@ -139,8 +133,7 @@
             "ref": "baserock/morph-2.7",
             "build-depends": [
                 "openssl",
-                "readline",
-                "zlib"
+                "readline"
             ]
         },
         {
@@ -214,8 +207,7 @@
                 "error-perl-tarball",
                 "gettext",
                 "libexpat",
-                "openssl",
-                "zlib"
+                "openssl"
             ]
         },
         {