From patchwork Mon Jun 17 11:06:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 251815 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id CCAFA2C029D for ; Mon, 17 Jun 2013 21:07:09 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 5BB1BA003E; Mon, 17 Jun 2013 11:07:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ObetsK-mXzNq; Mon, 17 Jun 2013 11:06:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 2468DA0062; Mon, 17 Jun 2013 11:06:59 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 555F88F753 for ; Mon, 17 Jun 2013 11:07:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 51FE48B284 for ; Mon, 17 Jun 2013 11:07:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id G+2wlOZFkIbN for ; Mon, 17 Jun 2013 11:06:59 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from loknar.toptech.com.ar (loknar.toptech.com.ar [78.46.79.162]) by whitealder.osuosl.org (Postfix) with ESMTPS id 04A7F8B267 for ; Mon, 17 Jun 2013 11:06:58 +0000 (UTC) Received: from asgard (host115.190-138-228.telecom.net.ar [190.138.228.115]) (authenticated bits=0) by loknar.toptech.com.ar (8.14.7/8.14.7) with ESMTP id r5HB6pbm011471 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 17 Jun 2013 11:06:53 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1371467215; bh=LetxDpPzjbdoqhV84XBSVQt0BIczUAYMBGy915Ckh+I=; h=From:To:Cc:Subject:Date; b=xFnmL/RyndHsm5Ngl26Y2Ipy7j1Xu4lR0B79Z7fxwrfvmjXDiuJnLrBuXMyf3CZ8a ywAF957r6Hxg9B24fs75UWxqN/Spv3y8K5jlkqiCR11vyjbJTUnVoLpAknyJgZEov3 c1h4rvqfFQAaWsnLm1inYAC2j3qkFdcYZRKVBpIc= Received: by asgard (sSMTP sendmail emulation); Mon, 17 Jun 2013 08:06:49 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Mon, 17 Jun 2013 08:06:48 -0300 Message-Id: <1371467208-13568-1-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 1.8.1.5 X-Virus-Scanned: clamav-milter 0.97.7 at loknar X-Virus-Status: Clean Subject: [Buildroot] [PATCH] uClibc 0.9.31: remove stray kludges/conditions X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Signed-off-by: Gustavo Zacarias --- package/binutils/Config.in.host | 11 +++++------ package/connman/Config.in | 4 ++-- package/libglib2/libglib2.mk | 2 +- toolchain/toolchain-buildroot/Config.in.2 | 11 +---------- 4 files changed, 9 insertions(+), 19 deletions(-) diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index d9bab44..3d687fe 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 93f9ab5..e0505b3 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 8a63bd9..4821a76 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 diff --git a/toolchain/toolchain-buildroot/Config.in.2 b/toolchain/toolchain-buildroot/Config.in.2 index 35d6db2..f58a4f7 100644 --- a/toolchain/toolchain-buildroot/Config.in.2 +++ b/toolchain/toolchain-buildroot/Config.in.2 @@ -44,19 +44,11 @@ config BR2_TOOLCHAIN_BUILDROOT_LOCALE config BR2_TOOLCHAIN_BUILDROOT_CXX bool "Enable C++ support" select BR2_INSTALL_LIBSTDCPP - depends on !(! BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE && \ - BR2_TOOLCHAIN_BUILDROOT_LOCALE && \ - BR2_UCLIBC_VERSION_0_9_31) help Enable this option if you want your toolchain to support the C++ language and you want C++ libraries to be installed on your target system. -comment "C++ support broken in uClibc 0.9.31 with locale enabled with gcc 4.2" - depends on !BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE && \ - BR2_TOOLCHAIN_BUILDROOT_LOCALE && \ - BR2_UCLIBC_VERSION_0_9_31 - config BR2_TOOLCHAIN_BUILDROOT_USE_SSP bool "Enable stack protection support" help @@ -68,7 +60,7 @@ config BR2_TOOLCHAIN_BUILDROOT_USE_SSP choice prompt "Thread library implementation" - default BR2_PTHREADS_NATIVE if (!BR2_UCLIBC_VERSION_0_9_31) && !BR2_ARM_OABI && !(BR2_avr32 || BR2_xtensa) + default BR2_PTHREADS_NATIVE if !BR2_ARM_OABI && !(BR2_avr32 || BR2_xtensa) default BR2_PTHREADS_OLD help Use this option to select the thread library implementation @@ -92,7 +84,6 @@ choice config BR2_PTHREADS_NATIVE bool "Native POSIX Threading (NPTL)" select BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_UCLIBC_VERSION_0_9_31 depends on !BR2_ARM_OABI depends on !BR2_x86_i386 depends on !BR2_avr32