Merge pull request #573 from stilor/add-libz-companion-lib

Add zlib as a companion lib

4 files changed, 32 insertions, 0 deletions

diff --git a/config/binutils/binutils.in.2 b/config/binutils/binutils.in.2
index 7a1291f..dfb00bd 100644
--- a/config/binutils/binutils.in.2
+++ b/config/binutils/binutils.in.2
@@ -2,6 +2,10 @@
 
 if ARCH_BINFMT_FLAT
 
+config ELF2FLT_REQUIRES_ZLIB
+    def_bool y
+    select ZLIB
+
 comment "elf2flt"
 
 choice
diff --git a/config/cc/gcc.in.2 b/config/cc/gcc.in.2
index 2c5d45e..aad488b 100644
--- a/config/cc/gcc.in.2
+++ b/config/cc/gcc.in.2
@@ -81,6 +81,9 @@ config CC_GCC_SYSTEM_ZLIB
     help
       Do not use bundled zlib, and use the zlib already available for
       the host (eg. the system library).
+
+      If zlib is built as a companion library, selecting this option
+      will use it.
       
       If you want to build a static toolchain, you will need to also
       install the static version of zlib for your host.
diff --git a/config/companion_libs.in b/config/companion_libs.in
index 7d1d4f7..02f2ecb 100644
--- a/config/companion_libs.in
+++ b/config/companion_libs.in
@@ -119,6 +119,12 @@ config NCURSES
 config NCURSES_TARGET
     bool
 
+config ZLIB
+    bool "Build local zlib"
+
+if ZLIB
+source "config/companion_libs/zlib.in"
+endif
 if LIBICONV
 source "config/companion_libs/libiconv.in"
 endif
diff --git a/config/companion_libs/zlib.in b/config/companion_libs/zlib.in
new file mode 100644
index 0000000..df93682
--- /dev/null
+++ b/config/companion_libs/zlib.in
@@ -0,0 +1,19 @@
+# Zlib options
+
+choice
+    bool
+    prompt "zlib version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
+
+config ZLIB_V_1_2_11
+    bool
+    prompt "1.2.11"
+
+endchoice
+
+config ZLIB_VERSION
+    string
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
+    default "1.2.11" if ZLIB_V_1_2_11