diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-07-30 10:21:40 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-07-30 10:21:40 +0200 |
| commit | 074b6689e81d5bc4abf08d63dc8086b9cc41a078 (patch) | |
| tree | 8cff99d679b7260a54cebac38af0764b16394b71 /toolchain | |
| parent | 18abd4aa94cd59240b90257c95877c0ea2fd1796 (diff) | |
| parent | e7584697f24d0bc6fc660703d97a38598cb76690 (diff) | |
Merge branch 'fixes-20100729' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'toolchain')
| -rwxr-xr-x | toolchain/dependencies/dependencies.sh | 4 | ||||
| -rw-r--r-- | toolchain/gdb/Config.in | 3 | ||||
| -rw-r--r-- | toolchain/toolchain-common.in | 4 |
3 files changed, 10 insertions, 1 deletions
diff --git a/toolchain/dependencies/dependencies.sh b/toolchain/dependencies/dependencies.sh index 96f843fc5..b3822ef66 100755 --- a/toolchain/dependencies/dependencies.sh +++ b/toolchain/dependencies/dependencies.sh @@ -137,13 +137,15 @@ if ! $SHELL --version 2>&1 | grep -q '^GNU bash'; then fi; # Check that a few mandatory programs are installed -for prog in awk bison flex msgfmt makeinfo patch gzip bzip2 perl tar wget cpio python ; do +for prog in awk bison flex msgfmt makeinfo patch gzip bzip2 perl tar wget cpio python svn ; do if ! which $prog > /dev/null ; then /bin/echo -e "\nYou must install '$prog' on your build machine"; if test $prog = "makeinfo" ; then /bin/echo -e "makeinfo is usually part of the texinfo package in your distribution\n" elif test $prog = "msgfmt" ; then /bin/echo -e "msgfmt is usually part of the gettext package in your distribution\n" + elif test $prog = "svn" ; then + /bin/echo -e "svn is usually part of the subversion package in your distribution\n" else /bin/echo -e "\n" fi diff --git a/toolchain/gdb/Config.in b/toolchain/gdb/Config.in index 09701c75e..edd8715f1 100644 --- a/toolchain/gdb/Config.in +++ b/toolchain/gdb/Config.in @@ -18,6 +18,9 @@ config BR2_PACKAGE_GDB_SERVER config BR2_PACKAGE_GDB_HOST bool "Build gdb for the Host" + # cross-gdb is supposed to be part of the external + # toolchain. And the build currently fails. + depends on !BR2_TOOLCHAIN_EXTERNAL help Build gdb to run on the host to debug programs run on the target. diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in index bea0c7c43..3c70f9c77 100644 --- a/toolchain/toolchain-common.in +++ b/toolchain/toolchain-common.in @@ -157,6 +157,7 @@ config BR2_GCC_CROSS_CXX config BR2_INSTALL_LIBSTDCPP bool "Build/install c++ compiler and libstdc++?" select BR2_GCC_CROSS_CXX + depends on !(BR2_avr32 && BR2_ENABLE_LOCALE && BR2_UCLIBC_VERSION_0_9_31) help If you are building your own toolchain and want to build and install the C++ compiler and library then you need to enable this option. @@ -164,6 +165,9 @@ config BR2_INSTALL_LIBSTDCPP support and you want to use the compiler / library then you need to select this option. +comment "C++ support broken in uClibc 0.9.31 with locale enabled" + depends on BR2_avr32 && BR2_ENABLE_LOCALE && BR2_UCLIBC_VERSION_0_9_31 + config BR2_TARGET_OPTIMIZATION string "Target Optimizations" default "-pipe" |