Add gettext and libiconv as companion libs

.. they're needed for the RPC generation in glibc
on both Cygwin and MinGW-w64.

Neither are built on GNU/Linux and iconv is not
built on Darwin.

Two patches for gettext are needed, one so that
-O0 works and one so that static builds can be
made.

They can take a good while to build, so if not
needed for_host or for_build then they are not
built.

Signed-off-by: Ray Donnelly <mingw.android@gmail.com>

4 files changed, 64 insertions, 0 deletions

diff --git a/config/companion_libs.in b/config/companion_libs.in
index c48fc827..0b0177c3 100644
--- a/config/companion_libs.in
+++ b/config/companion_libs.in
@@ -7,6 +7,17 @@ menu "Companion libraries"
 config COMPLIBS_NEEDED
     bool
 
+config LIBICONV_NEEDED
+    bool
+    select LIBICONV
+    select COMPLIBS_NEEDED
+
+config GETTEXT_NEEDED
+    bool
+    select GETTEXT
+    select LIBICONV_NEEDED
+    select COMPLIBS_NEEDED
+
 config GMP_NEEDED
     bool
     select GMP
@@ -45,6 +56,14 @@ config LIBELF_NEEDED
 config COMPLIBS
     bool
 
+config LIBICONV
+    bool
+    select COMPLIBS
+
+config GETTEXT
+    bool
+    select COMPLIBS
+
 config GMP
     bool
     select COMPLIBS
@@ -82,6 +101,12 @@ config LIBELF
 config LIBELF_TARGET
     bool
 
+if LIBICONV
+source "config/companion_libs/libiconv.in"
+endif
+if GETTEXT
+source "config/companion_libs/gettext.in"
+endif
 if GMP
 source "config/companion_libs/gmp.in"
 endif
diff --git a/config/companion_libs/gettext.in b/config/companion_libs/gettext.in
new file mode 100755
index 00000000..ef5e5a52
--- /dev/null
+++ b/config/companion_libs/gettext.in
@@ -0,0 +1,19 @@
+# gettext options
+
+choice
+    bool
+    prompt "gettext version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
+
+config GETTEXT_V_0_19_6
+    bool
+    prompt "0.19.6"
+
+endchoice
+
+config GETTEXT_VERSION
+    string
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
+    default "0.19.6" if GETTEXT_V_0_19_6
diff --git a/config/companion_libs/libiconv.in b/config/companion_libs/libiconv.in
new file mode 100644
index 00000000..361d34e0
--- /dev/null
+++ b/config/companion_libs/libiconv.in
@@ -0,0 +1,19 @@
+# libiconv options
+
+choice
+    bool
+    prompt "libiconv version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
+
+config LIBICONV_V_1_14
+    bool
+    prompt "1.14"
+
+endchoice
+
+config LIBICONV_VERSION
+    string
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
+    default "1.14" if LIBICONV_V_1_14
diff --git a/config/libc/glibc.in b/config/libc/glibc.in
index dee6748d..71df5011 100644
--- a/config/libc/glibc.in
+++ b/config/libc/glibc.in
@@ -4,6 +4,7 @@
 ##
 ## select LIBC_SUPPORT_THREADS_NATIVE
 ## select CC_CORE_PASSES_NEEDED
+## select GETTEXT_NEEDED
 ##
 ## help The de-facto standard for Linux distributions.
 ## help Feature-rich, but large...  Most useful for desktop-like systems.