diff options
| -rw-r--r-- | target/config/Config.in.libc | 10 | ||||
| -rw-r--r-- | toolchain/uclibc-ng/Makefile | 1 | ||||
| -rw-r--r-- | toolchain/uclibc-ng/Makefile.inc | 12 |
3 files changed, 11 insertions, 12 deletions
diff --git a/target/config/Config.in.libc b/target/config/Config.in.libc index 966924e12..019b22bf5 100644 --- a/target/config/Config.in.libc +++ b/target/config/Config.in.libc @@ -112,6 +112,10 @@ endchoice choice prompt "C library version" +config ADK_TARGET_LIB_UCLIBC_NG_1_0_14 + bool "1.0.14" + depends on ADK_TARGET_LIB_UCLIBC_NG + config ADK_TARGET_LIB_UCLIBC_NG_1_0_13 bool "1.0.13" depends on ADK_TARGET_LIB_UCLIBC_NG @@ -120,10 +124,6 @@ config ADK_TARGET_LIB_UCLIBC_NG_1_0_12 bool "1.0.12" depends on ADK_TARGET_LIB_UCLIBC_NG -config ADK_TARGET_LIB_UCLIBC_NG_1_0_11 - bool "1.0.11" - depends on ADK_TARGET_LIB_UCLIBC_NG - config ADK_TARGET_LIB_UCLIBC_NG_GIT bool "git" depends on ADK_TARGET_LIB_UCLIBC_NG @@ -214,9 +214,9 @@ config ADK_TARGET_LIBC config ADK_LIBC_VERSION string + default "1.0.14" if ADK_TARGET_LIB_UCLIBC_NG_1_0_14 default "1.0.13" if ADK_TARGET_LIB_UCLIBC_NG_1_0_13 default "1.0.12" if ADK_TARGET_LIB_UCLIBC_NG_1_0_12 - default "1.0.11" if ADK_TARGET_LIB_UCLIBC_NG_1_0_11 default "1.1.14" if ADK_TARGET_LIB_MUSL_1_1_14 default "1.1.13" if ADK_TARGET_LIB_MUSL_1_1_13 default "1.1.12" if ADK_TARGET_LIB_MUSL_1_1_12 diff --git a/toolchain/uclibc-ng/Makefile b/toolchain/uclibc-ng/Makefile index e3269d029..07aeedd35 100644 --- a/toolchain/uclibc-ng/Makefile +++ b/toolchain/uclibc-ng/Makefile @@ -161,7 +161,6 @@ ifeq ($(ADK_TARGET_WITHOUT_MMU),y) $(SED) 's/.*\(DOPIC\).*/# \1 is not set/' ${WRKBUILD}/.config endif ifeq ($(ADK_TARGET_ARCH_ARM_WITH_THUMB),y) - $(SED) 's/.*\(COMPILE_IN_THUMB_MODE\).*/\1=y/' ${WRKBUILD}/.config $(SED) 's/.*\(UCLIBC_HAS_CONTEXT_FUNCS\).*/# \1 is not set/' ${WRKBUILD}/.config endif endif diff --git a/toolchain/uclibc-ng/Makefile.inc b/toolchain/uclibc-ng/Makefile.inc index 09e864c9f..cd8e9ab3c 100644 --- a/toolchain/uclibc-ng/Makefile.inc +++ b/toolchain/uclibc-ng/Makefile.inc @@ -7,6 +7,12 @@ PKG_VERSION:= git PKG_RELEASE:= 1 PKG_SITES:= git://uclibc-ng.org/git/uclibc-ng endif +ifeq ($(ADK_TARGET_LIB_UCLIBC_NG_1_0_14),y) +PKG_VERSION:= 1.0.14 +PKG_RELEASE:= 1 +PKG_SITES:= http://downloads.uclibc-ng.org/releases/1.0.14/ +PKG_HASH:= 3c63d9f8c8b98b65fa5c4040d1c8ab1b36e99a16e1093810cedad51ac15c9a9e +endif ifeq ($(ADK_TARGET_LIB_UCLIBC_NG_1_0_13),y) PKG_VERSION:= 1.0.13 PKG_RELEASE:= 1 @@ -19,10 +25,4 @@ PKG_RELEASE:= 1 PKG_SITES:= http://downloads.uclibc-ng.org/releases/1.0.12/ PKG_HASH:= c238b300356b2638432e023076293f29935094108a2714ad1762b76015fae729 endif -ifeq ($(ADK_TARGET_LIB_UCLIBC_NG_1_0_11),y) -PKG_VERSION:= 1.0.11 -PKG_RELEASE:= 1 -PKG_SITES:= http://downloads.uclibc-ng.org/releases/1.0.11/ -PKG_HASH:= 2fdc6b9015f8049be0eb12a5e3e446de471fb80061115afd8d72ea582cb22b74 -endif DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.xz |