summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2016-12-16 23:54:11 (GMT)
committerAlexey Neyman <stilor@att.net>2017-01-10 18:38:08 (GMT)
commit8e7ac5fcd94d68cdd7cc7ad4638bdc0e48e9baf5 (patch)
treeb2df2a714f14fbe314b574ca814f0d35d3107c66
parentca0700010e9be397414b1eba8d82e66c976e03f6 (diff)
Change when libiconv/gettext are built.
Make them configurable, default to y when build!=host (i.e. canadian or cross-native) because we don't know what libraries the host will provide. GLIBC, as previously, selects them explicitly. Signed-off-by: Alexey Neyman <stilor@att.net>
-rw-r--r--config/companion_libs.in6
-rw-r--r--scripts/build/companion_libs/320-libiconv.sh6
-rw-r--r--scripts/build/companion_libs/330-gettext.sh6
3 files changed, 8 insertions, 10 deletions
diff --git a/config/companion_libs.in b/config/companion_libs.in
index 67094cb..e7e3ebb 100644
--- a/config/companion_libs.in
+++ b/config/companion_libs.in
@@ -62,11 +62,13 @@ config COMPLIBS
bool
config LIBICONV
- bool
+ bool "Build local libiconv"
+ default y if CANADIAN || CROSS_NATIVE
select COMPLIBS
config GETTEXT
- bool
+ bool "Build local gettext"
+ default y if CANADIAN || CROSS_NATIVE
select COMPLIBS
config GMP
diff --git a/scripts/build/companion_libs/320-libiconv.sh b/scripts/build/companion_libs/320-libiconv.sh
index 55da586..3f3ce24 100644
--- a/scripts/build/companion_libs/320-libiconv.sh
+++ b/scripts/build/companion_libs/320-libiconv.sh
@@ -22,10 +22,8 @@ do_libiconv_extract() {
do_libiconv_for_build() {
local -a libiconv_opts
- case "$CT_BUILD" in
- *darwin*|*linux*)
- return 0
- ;;
+ case "${CT_TOOLCHAIN_TYPE}" in
+ native|cross) return 0;;
esac
CT_DoStep INFO "Installing libiconv for build"
diff --git a/scripts/build/companion_libs/330-gettext.sh b/scripts/build/companion_libs/330-gettext.sh
index 07ea02b..88384f8 100644
--- a/scripts/build/companion_libs/330-gettext.sh
+++ b/scripts/build/companion_libs/330-gettext.sh
@@ -22,10 +22,8 @@ do_gettext_extract() {
do_gettext_for_build() {
local -a gettext_opts
- case "$CT_BUILD" in
- *linux*)
- return 0
- ;;
+ case "${CT_TOOLCHAIN_TYPE}" in
+ native|cross) return 0;;
esac
CT_DoStep INFO "Installing gettext for build"