diff options
| -rw-r--r-- | target/config/Config.in.libc.choice | 4 | ||||
| -rw-r--r-- | target/config/Config.in.libc.default | 6 | ||||
| -rw-r--r-- | toolchain/uclibc-ng/Makefile | 8 | ||||
| -rw-r--r-- | toolchain/uclibc-ng/Makefile.inc | 13 |
4 files changed, 24 insertions, 7 deletions
diff --git a/target/config/Config.in.libc.choice b/target/config/Config.in.libc.choice index 9666e84ec..f410643ce 100644 --- a/target/config/Config.in.libc.choice +++ b/target/config/Config.in.libc.choice @@ -67,6 +67,10 @@ endchoice choice prompt "C library version" +config ADK_TARGET_LIB_UCLIBC_NG_1_0_1 + bool "1.0.1" + depends on ADK_TARGET_LIB_UCLIBC_NG + config ADK_TARGET_LIB_UCLIBC_NG_1_0_0 bool "1.0.0" depends on ADK_TARGET_LIB_UCLIBC_NG diff --git a/target/config/Config.in.libc.default b/target/config/Config.in.libc.default index 9fdbadbd5..e67ea623b 100644 --- a/target/config/Config.in.libc.default +++ b/target/config/Config.in.libc.default @@ -28,6 +28,7 @@ config ADK_TARGET_LIBC config ADK_LIBC_VERSION string + default "1.0.1" if ADK_TARGET_LIB_UCLIBC_NG_1_0_1 default "1.0.0" if ADK_TARGET_LIB_UCLIBC_NG_1_0_0 default "1.1.6" if ADK_TARGET_LIB_MUSL_1_1_6 default "0.9.33.2" if ADK_TARGET_LIB_UCLIBC_0_9_33_2 @@ -38,6 +39,11 @@ config ADK_LIBC_VERSION ADK_TARGET_LIB_MUSL_GIT || \ ADK_TARGET_LIB_GLIBC_GIT +config ADK_TARGET_LIB_UCLIBC_NG_1_0 + bool + default y if ADK_TARGET_LIB_UCLIBC_NG_1_0_0 + default y if ADK_TARGET_LIB_UCLIBC_NG_1_0_1 + config ADK_TARGET_SUFFIX string default "gnueabihf" if ADK_TARGET_LIB_GLIBC && ADK_TARGET_ARCH_ARM && ADK_TARGET_HARD_FLOAT diff --git a/toolchain/uclibc-ng/Makefile b/toolchain/uclibc-ng/Makefile index c10cbb823..1fd4a5829 100644 --- a/toolchain/uclibc-ng/Makefile +++ b/toolchain/uclibc-ng/Makefile @@ -28,9 +28,9 @@ TARGET_CFLAGS+= -Wa,-msoft-float endif endif -#ifeq (${ADK_MAKE_PARALLEL},y) -#UCLIBC_MAKEOPTS+= -j${ADK_MAKE_JOBS} -#endif +ifeq (${ADK_MAKE_PARALLEL},y) +UCLIBC_MAKEOPTS+= -j${ADK_MAKE_JOBS} +endif $(WRKBUILD)/.headers: $(SED) 's,^CROSS_COMPILE=.*,CROSS_COMPILE=$(TARGET_CROSS),g' $(WRKBUILD)/Rules.mak @@ -98,7 +98,7 @@ ifeq ($(ADK_TARGET_LIB_WITHOUT_THREADS),y) endif endif -ifeq ($(ADK_TARGET_LIB_UCLIBC_NG_1_0_0),y) +ifeq ($(ADK_TARGET_LIB_UCLIBC_NG_1_0),y) ifeq ($(ADK_TARGET_WITH_NPTL),y) $(SED) 's/.*\(UCLIBC_HAS_THREADS_NATIVE\).*/\1=y/' ${WRKBUILD}/.config $(SED) 's/.*\(UCLIBC_HAS_TLS\).*/\1=y/' ${WRKBUILD}/.config diff --git a/toolchain/uclibc-ng/Makefile.inc b/toolchain/uclibc-ng/Makefile.inc index 89b2deed8..7634ce321 100644 --- a/toolchain/uclibc-ng/Makefile.inc +++ b/toolchain/uclibc-ng/Makefile.inc @@ -6,10 +6,17 @@ ifeq ($(ADK_LIBC_VERSION),git) PKG_VERSION:= 1.0.0-git PKG_RELEASE:= 1 PKG_SITES:= git://uclibc-ng.org/git/uclibc-ng -else -PKG_VERSION:= $(ADK_LIBC_VERSION) +endif +ifeq ($(ADK_TARGET_LIB_UCLIBC_NG_1_0_1),y) +PKG_VERSION:= 1.0.1 +PKG_RELEASE:= 1 +PKG_SITES:= http://downloads.uclibc-ng.org/releases/1.0.1/ +PKG_HASH:= e561040293ba4f21dcf3285ca1f683b5a8493eb0ffd3b3e495122cfde5a64a0e +endif +ifeq ($(ADK_TARGET_LIB_UCLIBC_NG_1_0_0),y) +PKG_VERSION:= 1.0.0 PKG_RELEASE:= 1 -PKG_SITES:= http://downloads.uclibc-ng.org/releases/$(ADK_LIBC_VERSION)/ +PKG_SITES:= http://downloads.uclibc-ng.org/releases/1.0.0/ PKG_HASH:= 56258bfa62e3a70c5d29480ccd8f8d94fc2740233a493d8c66b6e7a37830b9d1 endif DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.xz |