diff options
| author | Gustavo Zacarias <gustavo@zacarias.com.ar> | 2013-06-17 08:06:48 -0300 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2013-06-17 13:08:37 +0200 |
| commit | 25c3160092d7e542f77bf496af5ca7f0dc677aeb (patch) | |
| tree | 3e5dad9c9007f9ed01781703461e2f0e3c6e0763 /package | |
| parent | 5b81dd47703fd099e2b257ed0680ddc39524ace5 (diff) | |
| download | buildroot-novena-25c3160092d7e542f77bf496af5ca7f0dc677aeb.tar.gz buildroot-novena-25c3160092d7e542f77bf496af5ca7f0dc677aeb.zip | |
uClibc 0.9.31: remove stray kludges/conditions
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package')
| -rw-r--r-- | package/binutils/Config.in.host | 11 | ||||
| -rw-r--r-- | package/connman/Config.in | 4 | ||||
| -rw-r--r-- | package/libglib2/libglib2.mk | 2 |
3 files changed, 8 insertions, 9 deletions
diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index d9bab441f..3d687fe74 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -4,8 +4,7 @@ choice prompt "Binutils Version" depends on !BR2_arc default BR2_BINUTILS_VERSION_2_21 if (BR2_mips || BR2_mipsel || BR2_sh) - default BR2_BINUTILS_VERSION_2_21_1 if (!BR2_UCLIBC_VERSION_0_9_31) - default BR2_BINUTILS_VERSION_2_21 + default BR2_BINUTILS_VERSION_2_21_1 help Select the version of binutils you wish to use. @@ -22,19 +21,19 @@ choice bool "binutils 2.21" config BR2_BINUTILS_VERSION_2_21_1 - depends on !(BR2_avr32 || BR2_UCLIBC_VERSION_0_9_31) + depends on !BR2_avr32 bool "binutils 2.21.1" config BR2_BINUTILS_VERSION_2_22 - depends on !(BR2_avr32 || BR2_UCLIBC_VERSION_0_9_31) + depends on !BR2_avr32 bool "binutils 2.22" config BR2_BINUTILS_VERSION_2_23_1 - depends on !(BR2_avr32 || BR2_UCLIBC_VERSION_0_9_31) + depends on !BR2_avr32 bool "binutils 2.23.1" config BR2_BINUTILS_VERSION_2_23_2 - depends on !(BR2_avr32 || BR2_UCLIBC_VERSION_0_9_31) + depends on !BR2_avr32 bool "binutils 2.23.2" endchoice diff --git a/package/connman/Config.in b/package/connman/Config.in index 93f9ab518..e0505b312 100644 --- a/package/connman/Config.in +++ b/package/connman/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_CONNMAN select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_IPTABLES select BR2_PACKAGE_GNUTLS - depends on !(BR2_UCLIBC_VERSION_0_9_31 || BR2_UCLIBC_VERSION_0_9_32) + depends on !BR2_UCLIBC_VERSION_0_9_32 depends on BR2_USE_WCHAR # libglib2 and gnutls depends on BR2_INET_IPV6 depends on BR2_TOOLCHAIN_HAS_THREADS # dbus @@ -50,5 +50,5 @@ config BR2_PACKAGE_CONNMAN_CLIENT endif # BR2_PACKAGE_CONNMAN comment "connman needs a toolchain with IPv6, WCHAR, thread and resolver support" - depends on BR2_UCLIBC_VERSION_0_9_31 || BR2_UCLIBC_VERSION_0_9_32 || \ + depends on BR2_UCLIBC_VERSION_0_9_32 || \ !BR2_USE_WCHAR || !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index 8a63bd949..4821a765f 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -52,7 +52,7 @@ LIBGLIB2_CONF_ENV = \ gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no) # old uClibc versions don't provide qsort_r -ifeq ($(BR2_UCLIBC_VERSION_0_9_31)$(BR2_UCLIBC_VERSION_0_9_32)$(BR2_TOOLCHAIN_CTNG_uClibc)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2)$(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2),y) +ifeq ($(BR2_UCLIBC_VERSION_0_9_32)$(BR2_TOOLCHAIN_CTNG_uClibc)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2)$(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2),y) LIBGLIB2_CONF_ENV += glib_cv_have_qsort_r=no else LIBGLIB2_CONF_ENV += glib_cv_have_qsort_r=yes |