summaryrefslogtreecommitdiff
path: root/toolchain
diff options
context:
space:
mode:
authoracoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-12-03 16:36:37 +0000
committeracoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-12-03 16:36:37 +0000
commit7873df547d0423a7da9a3e6c7810b2fc4c30eb3a (patch)
treeba30092bea3e93ad38d026851c3e16c371f47adf /toolchain
parent345320ab12262c3c5070ac11a3209a58d0138d16 (diff)
toolchain/uClibc: sync to latest uClibc-0.9.32
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24229 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/uClibc/Makefile2
-rw-r--r--toolchain/uClibc/patches-0.9.32/100-do_not_select_extra-warnings.patch6
2 files changed, 4 insertions, 4 deletions
diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index c5dea08bb4..0926c53f5a 100644
--- a/toolchain/uClibc/Makefile
+++ b/toolchain/uClibc/Makefile
@@ -14,7 +14,7 @@ PKG_VERSION:=$(call qstrip,$(CONFIG_UCLIBC_VERSION))
ifeq ($(CONFIG_UCLIBC_VERSION_0_9_32),y)
PKG_SOURCE_URL:=git://git.busybox.net/uClibc
PKG_SOURCE_PROTO:=git
- PKG_SOURCE_VERSION:=22bf234a7119559901adfedc9991876af01eb64c
+ PKG_SOURCE_VERSION:=e2903ddb06b1f50cb4ac9af0b035c74ed6b9d30f
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
LIBC_SO_VERSION:=$(PKG_VERSION)-git
diff --git a/toolchain/uClibc/patches-0.9.32/100-do_not_select_extra-warnings.patch b/toolchain/uClibc/patches-0.9.32/100-do_not_select_extra-warnings.patch
index c76a8d16af..2c3a69e334 100644
--- a/toolchain/uClibc/patches-0.9.32/100-do_not_select_extra-warnings.patch
+++ b/toolchain/uClibc/patches-0.9.32/100-do_not_select_extra-warnings.patch
@@ -1,10 +1,10 @@
--- a/extra/Configs/Config.in
+++ b/extra/Configs/Config.in
-@@ -453,7 +453,6 @@
+@@ -453,7 +453,6 @@ config UCLIBC_HAS_THREADS_NATIVE
select UCLIBC_HAS_TLS
select UCLIBC_HAS_STDIO_FUTEXES
# NPTL local:
- select EXTRA_WARNINGS
+ # i386 has no lowlevellock support (yet) as opposed to i486 onward
+ depends on !CONFIG_386
help
- If you want to compile uClibc with NPTL support, then answer Y.
-