From c36ff15273b4b2ffe39cda43c330bcc173b5f73b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 24 Feb 2016 22:13:32 +0100 Subject: musl: update to latest version --- target/config/Config.in.libc | 10 +++++----- toolchain/musl/Makefile.inc | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/target/config/Config.in.libc b/target/config/Config.in.libc index d3779faa7..84c990e2f 100644 --- a/target/config/Config.in.libc +++ b/target/config/Config.in.libc @@ -112,6 +112,10 @@ config ADK_TARGET_LIB_GLIBC_GIT bool "git" depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_OR1K +config ADK_TARGET_LIB_MUSL_1_1_14 + bool "1.1.14" + depends on ADK_TARGET_LIB_MUSL + config ADK_TARGET_LIB_MUSL_1_1_13 bool "1.1.13" depends on ADK_TARGET_LIB_MUSL @@ -120,10 +124,6 @@ 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 - config ADK_TARGET_LIB_MUSL_GIT bool "git" depends on ADK_TARGET_LIB_MUSL @@ -174,9 +174,9 @@ config ADK_LIBC_VERSION 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.0.10" if ADK_TARGET_LIB_UCLIBC_NG_1_0_10 + 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 - default "1.1.11" if ADK_TARGET_LIB_MUSL_1_1_11 default "2.23" if ADK_TARGET_LIB_GLIBC_2_23 default "2.22" if ADK_TARGET_LIB_GLIBC_2_22 default "2.21" if ADK_TARGET_LIB_GLIBC_2_21 diff --git a/toolchain/musl/Makefile.inc b/toolchain/musl/Makefile.inc index 897cd63fa..ea0796e34 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_14),y) +PKG_VERSION:= 1.1.14 +PKG_RELEASE:= 1 +PKG_HASH:= 35f6c00c84a6091bd5dab29eedde7508dae755ead92dcc0239f3677d1055b9b5 +PKG_SITES:= http://www.musl-libc.org/releases/ +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +endif ifeq ($(ADK_TARGET_LIB_MUSL_1_1_13),y) PKG_VERSION:= 1.1.13 PKG_RELEASE:= 1 @@ -22,10 +29,3 @@ 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 -PKG_HASH:= bb9e6da51b7b12641f5d1abb39705c6c6c1b2fbd20002362948aa736a0aa353f -PKG_SITES:= http://www.musl-libc.org/releases/ -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz -endif -- cgit v1.2.3