summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2017-02-01 22:34:06 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2017-02-01 22:34:06 +0100
commitcdfd1b383c563e835efc5a0aa356289b22db5b3a (patch)
treefa844a30d8757da11c785a67176a2b896cad11a6
parent6140a1d632ac8ad592fb8a54fbcb0799a49fa9a3 (diff)
uclibc-ng: update to 1.0.22
-rw-r--r--target/config/Config.in.libc6
-rw-r--r--toolchain/uclibc-ng/Makefile.inc8
-rw-r--r--toolchain/uclibc-ng/patches/1.0.21/iconv.patch12
3 files changed, 7 insertions, 19 deletions
diff --git a/target/config/Config.in.libc b/target/config/Config.in.libc
index 821968750..4ddcf1fa9 100644
--- a/target/config/Config.in.libc
+++ b/target/config/Config.in.libc
@@ -127,8 +127,8 @@ endchoice
choice
prompt "C library version"
-config ADK_TARGET_LIB_UCLIBC_NG_1_0_21
- bool "1.0.21"
+config ADK_TARGET_LIB_UCLIBC_NG_1_0_22
+ bool "1.0.22"
depends on ADK_TARGET_LIB_UCLIBC_NG
config ADK_TARGET_LIB_UCLIBC_NG_GIT
@@ -196,7 +196,7 @@ config ADK_TARGET_LIBC
config ADK_LIBC_VERSION
string
- default "1.0.21" if ADK_TARGET_LIB_UCLIBC_NG_1_0_21
+ default "1.0.22" if ADK_TARGET_LIB_UCLIBC_NG_1_0_22
default "1.1.16" if ADK_TARGET_LIB_MUSL_1_1_16
default "2.23" if ADK_TARGET_LIB_GLIBC_2_23
default "2.4.0" if ADK_TARGET_LIB_NEWLIB_2_4_0
diff --git a/toolchain/uclibc-ng/Makefile.inc b/toolchain/uclibc-ng/Makefile.inc
index 5a942ebba..e2fd6a660 100644
--- a/toolchain/uclibc-ng/Makefile.inc
+++ b/toolchain/uclibc-ng/Makefile.inc
@@ -7,10 +7,10 @@ PKG_VERSION:= git
PKG_RELEASE:= 1
PKG_SITES:= git://uclibc-ng.org/git/uclibc-ng
endif
-ifeq ($(ADK_TARGET_LIB_UCLIBC_NG_1_0_21),y)
-PKG_VERSION:= 1.0.21
+ifeq ($(ADK_TARGET_LIB_UCLIBC_NG_1_0_22),y)
+PKG_VERSION:= 1.0.22
PKG_RELEASE:= 1
-PKG_SITES:= http://downloads.uclibc-ng.org/releases/1.0.21/
-PKG_HASH:= 6e99ebebe8a46ddcd26615828d51b62dbf580568aa58bf5f495da37eba0c872d
+PKG_SITES:= http://downloads.uclibc-ng.org/releases/1.0.22/
+PKG_HASH:= f2004c85db8e07e9f1c2e8b7c513fa7c237bc9f9685d8e1bfc89535b8a85449b
endif
DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.xz
diff --git a/toolchain/uclibc-ng/patches/1.0.21/iconv.patch b/toolchain/uclibc-ng/patches/1.0.21/iconv.patch
deleted file mode 100644
index 0069eb042..000000000
--- a/toolchain/uclibc-ng/patches/1.0.21/iconv.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur uClibc-ng-1.0.21.orig/Makefile.in uClibc-ng-1.0.21/Makefile.in
---- uClibc-ng-1.0.21.orig/Makefile.in 2016-12-26 09:12:14.000000000 +0100
-+++ uClibc-ng-1.0.21/Makefile.in 2016-12-27 18:33:22.312597987 +0100
-@@ -282,7 +282,7 @@
- HEADERS_RM-$(UCLIBC_HAS_BACKTRACE) += execinfo.h
- HEADERS_RM-$(UCLIBC_HAS_LIBICONV) += iconv.h
- HEADERS_RM-$(UCLIBC_HAS_LIBINTL) += intl.h
--HEADERS_RM-$(UCLIBC_HAS_LOCALE) += iconv.h bits/uClibc_ctype.h
-+HEADERS_RM-$(UCLIBC_HAS_LOCALE) += bits/uClibc_ctype.h
- HEADERS_RM-$(UCLIBC_HAS_PTY) += pty.h
- HEADERS_RM-$(UCLIBC_HAS_REALTIME) += mqueue.h bits/mqueue.h sched.h \
- bits/sched.h \