summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@uclibc-ng.org>2016-07-06 07:38:24 +0200
committerWaldemar Brodkorb <wbx@uclibc-ng.org>2016-07-06 07:38:47 +0200
commit6b90348582447ca53e014eb162c687751f7cb4fe (patch)
treec0e72e09e1d5d56f4b545a613e673704d52eaa44
parent517bdcccb47d4ea4582aa64df35f7f9aef34bc70 (diff)
musl: update to 1.1.15
-rw-r--r--target/config/Config.in.libc10
-rw-r--r--toolchain/musl/Makefile.inc14
2 files changed, 12 insertions, 12 deletions
diff --git a/target/config/Config.in.libc b/target/config/Config.in.libc
index 59e92f181..1d0c89555 100644
--- a/target/config/Config.in.libc
+++ b/target/config/Config.in.libc
@@ -154,6 +154,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_15
+ bool "1.1.15"
+ depends on ADK_TARGET_LIB_MUSL
+
config ADK_TARGET_LIB_MUSL_1_1_14
bool "1.1.14"
depends on ADK_TARGET_LIB_MUSL
@@ -162,10 +166,6 @@ config ADK_TARGET_LIB_MUSL_1_1_13
bool "1.1.13"
depends on ADK_TARGET_LIB_MUSL
-config ADK_TARGET_LIB_MUSL_1_1_12
- bool "1.1.12"
- depends on ADK_TARGET_LIB_MUSL
-
config ADK_TARGET_LIB_MUSL_GIT
bool "git"
depends on ADK_TARGET_LIB_MUSL
@@ -221,9 +221,9 @@ config ADK_LIBC_VERSION
default "1.0.16" if ADK_TARGET_LIB_UCLIBC_NG_1_0_16
default "1.0.15" if ADK_TARGET_LIB_UCLIBC_NG_1_0_15
default "1.0.14" if ADK_TARGET_LIB_UCLIBC_NG_1_0_14
+ default "1.1.15" if ADK_TARGET_LIB_MUSL_1_1_15
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 "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 ea0796e34..d2222c41a 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_15),y)
+PKG_VERSION:= 1.1.15
+PKG_RELEASE:= 1
+PKG_HASH:= 97e447c7ee2a7f613186ec54a93054fe15469fe34d7d323080f7ef38f5ecb0fa
+PKG_SITES:= http://www.musl-libc.org/releases/
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+endif
ifeq ($(ADK_TARGET_LIB_MUSL_1_1_14),y)
PKG_VERSION:= 1.1.14
PKG_RELEASE:= 1
@@ -22,10 +29,3 @@ PKG_HASH:= bbacdc64f557d0c4857f7d2daf592c32c29aec1babbb94fcf01a2e05bed15013
PKG_SITES:= http://www.musl-libc.org/releases/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
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