diff options
| -rw-r--r-- | target/config/Config.in.libc.choice | 9 | ||||
| -rw-r--r-- | target/config/Config.in.libc.default | 2 | ||||
| -rw-r--r-- | toolchain/musl/Makefile.inc | 14 |
3 files changed, 12 insertions, 13 deletions
diff --git a/target/config/Config.in.libc.choice b/target/config/Config.in.libc.choice index 41730f808..3e4b20f68 100644 --- a/target/config/Config.in.libc.choice +++ b/target/config/Config.in.libc.choice @@ -83,6 +83,10 @@ config ADK_TARGET_LIB_GLIBC_GIT bool "git" depends on ADK_TARGET_LIB_GLIBC +config ADK_TARGET_LIB_MUSL_1_1_12 + bool "1.1.12" + depends on ADK_TARGET_LIB_MUSL + config ADK_TARGET_LIB_MUSL_1_1_11 bool "1.1.11" depends on ADK_TARGET_LIB_MUSL @@ -91,11 +95,6 @@ config ADK_TARGET_LIB_MUSL_1_1_10 bool "1.1.10" depends on ADK_TARGET_LIB_MUSL -config ADK_TARGET_LIB_MUSL_1_1_9 - bool "1.1.9" - depends on ADK_TARGET_LIB_MUSL - - config ADK_TARGET_LIB_MUSL_GIT bool "git" depends on ADK_TARGET_LIB_MUSL diff --git a/target/config/Config.in.libc.default b/target/config/Config.in.libc.default index 177b2d9e6..0036a0d67 100644 --- a/target/config/Config.in.libc.default +++ b/target/config/Config.in.libc.default @@ -24,9 +24,9 @@ config ADK_LIBC_VERSION default "1.0.7" if ADK_TARGET_LIB_UCLIBC_NG_1_0_7 default "1.0.6" if ADK_TARGET_LIB_UCLIBC_NG_1_0_6 default "1.0.5" if ADK_TARGET_LIB_UCLIBC_NG_1_0_5 + default "1.1.12" if ADK_TARGET_LIB_MUSL_1_1_12 default "1.1.11" if ADK_TARGET_LIB_MUSL_1_1_11 default "1.1.10" if ADK_TARGET_LIB_MUSL_1_1_10 - default "1.1.9" if ADK_TARGET_LIB_MUSL_1_1_9 default "2.22" if ADK_TARGET_LIB_GLIBC_2_22 default "2.21" if ADK_TARGET_LIB_GLIBC_2_21 default "2.20" if ADK_TARGET_LIB_GLIBC_2_20 diff --git a/toolchain/musl/Makefile.inc b/toolchain/musl/Makefile.inc index 398d9d4df..3e564ca0d 100644 --- a/toolchain/musl/Makefile.inc +++ b/toolchain/musl/Makefile.inc @@ -8,6 +8,13 @@ PKG_RELEASE:= 1 PKG_SITES:= git://git.musl-libc.org/musl DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz endif +ifeq ($(ADK_TARGET_LIB_MUSL_1_1_12),y) +PKG_VERSION:= 1.1.12 +PKG_RELEASE:= 1 +PKG_HASH:= 720b83c7e276b4b679c0bffe9509340d5f81fd601508e607e708177df0d31c0e +PKG_SITES:= http://www.musl-libc.org/releases/ +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +endif ifeq ($(ADK_TARGET_LIB_MUSL_1_1_11),y) PKG_VERSION:= 1.1.11 PKG_RELEASE:= 1 @@ -22,10 +29,3 @@ PKG_HASH:= 45bbe9b1c7f7a0f743477af1e103b6889bfe4dd9815e16f6c89f6c90831c8b7c PKG_SITES:= http://www.musl-libc.org/releases/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz endif -ifeq ($(ADK_TARGET_LIB_MUSL_1_1_9),y) -PKG_VERSION:= 1.1.9 -PKG_RELEASE:= 1 -PKG_HASH:= 00bf7173caf972c88cd07cb0d420c082a2f35efcccc1a81f8909bec2d030283e -PKG_SITES:= http://www.musl-libc.org/releases/ -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz -endif |