From 874f4bd668e0ab9293eb10fa19fe5279768a0ce7 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Fri, 16 Dec 2016 15:51:04 -0800 Subject: Disallow c++ for baremetal. libstdc++ configure fails to find . Signed-off-by: Alexey Neyman --- config/cc/gcc.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/cc/gcc.in b/config/cc/gcc.in index a98b9f10..78082416 100644 --- a/config/cc/gcc.in +++ b/config/cc/gcc.in @@ -1,7 +1,7 @@ # Compiler options # ## default y -## select CC_SUPPORT_CXX +## select CC_SUPPORT_CXX if !LIBC_none ## select CC_SUPPORT_FORTRAN ## select CC_SUPPORT_JAVA ## select CC_SUPPORT_ADA -- cgit v1.2.3 From 8e7ac5fcd94d68cdd7cc7ad4638bdc0e48e9baf5 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Fri, 16 Dec 2016 15:54:11 -0800 Subject: 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 --- config/companion_libs.in | 6 ++++-- scripts/build/companion_libs/320-libiconv.sh | 6 ++---- scripts/build/companion_libs/330-gettext.sh | 6 ++---- 3 files changed, 8 insertions(+), 10 deletions(-) (limited to 'config') diff --git a/config/companion_libs.in b/config/companion_libs.in index 67094cb9..e7e3ebb3 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 55da586e..3f3ce243 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 07ea02b8..88384f87 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" -- 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 'config') 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