summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2017-02-16 04:37:21 (GMT)
committerGitHub <noreply@github.com>2017-02-16 04:37:21 (GMT)
commit2d1b469f888858180ee95d43a0b89981b38cf93e (patch)
treefd92dbfbb73f9fdf4e07468e6c0888d77f0af87e
parent2f052394a5376fe90c240972e2cb8f8abcc7267c (diff)
parent07e03aed8c43ea4c295575bd91f2774b25be8d19 (diff)
Merge pull request #599 from stilor/avoid-gettext-for-linux-host
Skip gettext/libiconv on linux-gnu
-rw-r--r--scripts/build/companion_libs/320-libiconv.sh9
-rw-r--r--scripts/build/companion_libs/330-gettext.sh27
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 3e7df3d..f2f0bef 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 9c1f1de..8828e5d 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}" \