Skip gettext/libiconv on linux-gnu

Previous version by Ray Donnelly was skipping them for all *linux*.
This skips it for GLIBC only.

Signed-off-by: Alexey Neyman <stilor@att.net>

2 files changed, 24 insertions, 12 deletions

diff --git a/scripts/build/companion_libs/320-libiconv.sh b/scripts/build/companion_libs/320-libiconv.sh
index 3e7df3dc..f2f0bef8 100644
--- a/scripts/build/companion_libs/320-libiconv.sh
+++ b/scripts/build/companion_libs/320-libiconv.sh
@@ -76,12 +76,19 @@ do_libiconv_backend() {
         eval "${arg// /\\ }"
     done
 
-    CT_DoLog EXTRA "Configuring libiconv"
+    case "${host}" in
+        *-linux-gnu*)
+            CT_DoLog EXTRA "Skipping (included in GNU C library)"
+            return
+            ;;
+    esac
 
     if [ "${shared}" != "y" ]; then
         extra_config+=("--disable-shared")
     fi
 
+    CT_DoLog EXTRA "Configuring libiconv"
+
     CT_DoExecLog CFG                                          \
     CFLAGS="${cflags}"                                        \
     LDFLAGS="${ldflags}"                                      \
diff --git a/scripts/build/companion_libs/330-gettext.sh b/scripts/build/companion_libs/330-gettext.sh
index 9c1f1de0..8828e5de 100644
--- a/scripts/build/companion_libs/330-gettext.sh
+++ b/scripts/build/companion_libs/330-gettext.sh
@@ -76,18 +76,21 @@ do_gettext_backend() {
         eval "${arg// /\\ }"
     done
 
-    CT_DoLog EXTRA "Configuring gettext"
-
-    # A bit ugly. D__USE_MINGW_ANSI_STDIO=1 has its own {v}asprintf functions
-    # but gettext configure doesn't see this flag when it checks for that. An
-    # alternative may be to use CC="${host}-gcc ${cflags}" but that didn't
-    # work.
-    # -O2 works around bug at http://savannah.gnu.org/bugs/?36443
-    # gettext needs some fixing for MinGW-w64 it would seem.
-    # -DLIBXML_STATIC needed to link with libxml (provided by gnulib) under
-    # MinGW: without this flag, xmlFree is defined as `dllimport` by libxml
-    # headers and hence fails to link.
     case "${host}" in
+        *-linux-gnu*)
+            CT_DoLog EXTRA "Skipping (included in GNU C library)"
+            return
+            ;;
+
+        # A bit ugly. D__USE_MINGW_ANSI_STDIO=1 has its own {v}asprintf functions
+        # but gettext configure doesn't see this flag when it checks for that. An
+        # alternative may be to use CC="${host}-gcc ${cflags}" but that didn't
+        # work.
+        # -O2 works around bug at http://savannah.gnu.org/bugs/?36443
+        # gettext needs some fixing for MinGW-w64 it would seem.
+        # -DLIBXML_STATIC needed to link with libxml (provided by gnulib) under
+        # MinGW: without this flag, xmlFree is defined as `dllimport` by libxml
+        # headers and hence fails to link.
         *mingw*)
             case "${cflags}" in
                 *D__USE_MINGW_ANSI_STDIO=1*)
@@ -103,6 +106,8 @@ do_gettext_backend() {
         extra_config+=("--disable-shared")
     fi
 
+    CT_DoLog EXTRA "Configuring gettext"
+
     CT_DoExecLog CFG                                        \
     CFLAGS="${cflags}"                                      \
     LDFLAGS="${ldflags}"                                    \