From 11f87cfa5da701e156450910a3c586419a3bf00a Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Fri, 16 Dec 2016 15:52:26 -0800 Subject: Kill CT_COMPLIBS_SHARED. There is no such option so the check is always true. Signed-off-by: Alexey Neyman --- scripts/build/cc/100-gcc.sh | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'scripts/build/cc') diff --git a/scripts/build/cc/100-gcc.sh b/scripts/build/cc/100-gcc.sh index 164fb9ba..cb0a4fae 100644 --- a/scripts/build/cc/100-gcc.sh +++ b/scripts/build/cc/100-gcc.sh @@ -478,14 +478,13 @@ do_gcc_core_backend() { host_libstdcxx_flags+=("-static-libgcc") host_libstdcxx_flags+=("-Wl,-Bstatic,-lstdc++,-Bdynamic") host_libstdcxx_flags+=("-lm") - elif [ "${CT_COMPLIBS_SHARED}" != "y" ]; then - # When companion libraries are build static (eg !shared), - # the libstdc++ is not pulled automatically, although it - # is needed. Shoe-horn it in our LDFLAGS - # Ditto libm on some Fedora boxen - core_LDFLAGS+=("-lstdc++") - core_LDFLAGS+=("-lm") fi + # When companion libraries are build static (eg !shared), + # the libstdc++ is not pulled automatically, although it + # is needed. Shoe-horn it in our LDFLAGS + # Ditto libm on some Fedora boxen + core_LDFLAGS+=("-lstdc++") + core_LDFLAGS+=("-lm") fi if [ "${CT_CC_GCC_USE_GMP_MPFR}" = "y" ]; then @@ -985,14 +984,13 @@ do_gcc_backend() { host_libstdcxx_flags+=("-static-libgcc") host_libstdcxx_flags+=("-Wl,-Bstatic,-lstdc++,-Bdynamic") host_libstdcxx_flags+=("-lm") - elif [ "${CT_COMPLIBS_SHARED}" != "y" ]; then - # When companion libraries are build static (eg !shared), - # the libstdc++ is not pulled automatically, although it - # is needed. Shoe-horn it in our LDFLAGS - # Ditto libm on some Fedora boxen - final_LDFLAGS+=("-lstdc++") - final_LDFLAGS+=("-lm") fi + # When companion libraries are build static (eg !shared), + # the libstdc++ is not pulled automatically, although it + # is needed. Shoe-horn it in our LDFLAGS + # Ditto libm on some Fedora boxen + final_LDFLAGS+=("-lstdc++") + final_LDFLAGS+=("-lm") fi if [ "${CT_CC_GCC_USE_GMP_MPFR}" = "y" ]; then -- cgit v1.2.3 From 9f62ca8deb3a16ac86ebc35c0093b82423900633 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Sun, 18 Dec 2016 19:04:37 -0800 Subject: Select libintl from gettext we built. Also, require gettext for NLS, and require iconv/ncurses for gettext. Signed-off-by: Alexey Neyman --- config/companion_libs.in | 2 ++ config/toolchain.in | 1 + scripts/build/cc/100-gcc.sh | 12 ++++++++++-- 3 files changed, 13 insertions(+), 2 deletions(-) (limited to 'scripts/build/cc') diff --git a/config/companion_libs.in b/config/companion_libs.in index e7e3ebb3..7d1d4f74 100644 --- a/config/companion_libs.in +++ b/config/companion_libs.in @@ -69,6 +69,8 @@ config LIBICONV config GETTEXT bool "Build local gettext" default y if CANADIAN || CROSS_NATIVE + select LIBICONV_NEEDED + select NCURSES_NEEDED select COMPLIBS config GMP diff --git a/config/toolchain.in b/config/toolchain.in index ca74ee70..b8c1b4af 100644 --- a/config/toolchain.in +++ b/config/toolchain.in @@ -308,6 +308,7 @@ comment "Misc options" config TOOLCHAIN_ENABLE_NLS bool prompt "Enable nls" + select GETTEXT_NEEDED help Say 'Y' here to enable native language support (nls). diff --git a/scripts/build/cc/100-gcc.sh b/scripts/build/cc/100-gcc.sh index cb0a4fae..947d4afd 100644 --- a/scripts/build/cc/100-gcc.sh +++ b/scripts/build/cc/100-gcc.sh @@ -560,7 +560,11 @@ do_gcc_core_backend() { ;; # ARCH is mips esac - [ "${CT_TOOLCHAIN_ENABLE_NLS}" != "y" ] && extra_config+=("--disable-nls") + if [ "${CT_TOOLCHAIN_ENABLE_NLS}" = "y" ]; then + extra_config+=("--with-libintl-prefix=${complibs}") + else + extra_config+=("--disable-nls") + fi if [ "${CT_CC_GCC_SYSTEM_ZLIB}" = "y" ]; then extra_config+=("--with-system-zlib") @@ -1084,7 +1088,11 @@ do_gcc_backend() { ;; # ARCH is mips esac - [ "${CT_TOOLCHAIN_ENABLE_NLS}" != "y" ] && extra_config+=("--disable-nls") + if [ "${CT_TOOLCHAIN_ENABLE_NLS}" = "y" ]; then + extra_config+=("--with-libintl-prefix=${complibs}") + else + extra_config+=("--disable-nls") + fi if [ "${CT_CC_GCC_SYSTEM_ZLIB}" = "y" ]; then extra_config+=("--with-system-zlib") -- cgit v1.2.3