Merge pull request #599 from stilor/avoid-gettext-for-linux-host

Skip gettext/libiconv on linux-gnu
This commit is contained in:
Alexey Neyman 2017-02-15 20:37:21 -08:00 committed by GitHub
commit 2d1b469f88
2 changed files with 24 additions and 12 deletions

View File

@ -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}" \

View File

@ -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}" \