aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-05-21 14:09:58 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-05-21 14:09:58 +0000
commit8ad21a82e9cb0639c2095debf38318fc2a3c79a2 (patch)
tree37d5f673d7fc256d88d728a08fb925f337a32ffd
parent962575f201db7723bbcbdbbf7a82203e0351022d (diff)
downloadupstream-8ad21a82e9cb0639c2095debf38318fc2a3c79a2.tar.gz
upstream-8ad21a82e9cb0639c2095debf38318fc2a3c79a2.tar.bz2
upstream-8ad21a82e9cb0639c2095debf38318fc2a3c79a2.zip
musl: update to version 1.1.1
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 40820
-rw-r--r--toolchain/musl/Config.in16
-rw-r--r--toolchain/musl/Config.version6
-rw-r--r--toolchain/musl/common.mk5
-rw-r--r--toolchain/musl/patches/100-add_glob_onlydir.patch (renamed from toolchain/musl/patches-1.0.0/100-add_glob_onlydir.patch)0
4 files changed, 3 insertions, 24 deletions
diff --git a/toolchain/musl/Config.in b/toolchain/musl/Config.in
index 8892af01a1..05caa6ab6f 100644
--- a/toolchain/musl/Config.in
+++ b/toolchain/musl/Config.in
@@ -1,19 +1,3 @@
-# Choose musl version.
-
-choice
- prompt "musl Version"
- depends on TOOLCHAINOPTS && USE_MUSL
- default MUSL_USE_VERSION_1_0_0
- help
- Select the version of musl you wish to use.
-
- config MUSL_USE_VERSION_1_0_0
- select MUSL_VERSION_1_0_0
- bool "musl 1.0.0"
-
-endchoice
-
-
# Debug version.
config MUSL_ENABLE_DEBUG
diff --git a/toolchain/musl/Config.version b/toolchain/musl/Config.version
index 685aef2b9d..7a25126477 100644
--- a/toolchain/musl/Config.version
+++ b/toolchain/musl/Config.version
@@ -3,10 +3,6 @@ if USE_MUSL
config MUSL_VERSION
string
depends on USE_MUSL
- default "1.0.0" if MUSL_VERSION_1_0_0
-
-config MUSL_VERSION_1_0_0
- default y if !TOOLCHAINOPTS
- bool
+ default "1.1.1"
endif
diff --git a/toolchain/musl/common.mk b/toolchain/musl/common.mk
index e974d28fb9..93fab04113 100644
--- a/toolchain/musl/common.mk
+++ b/toolchain/musl/common.mk
@@ -11,13 +11,12 @@ PKG_NAME:=musl
PKG_VERSION:=$(call qstrip,$(CONFIG_MUSL_VERSION))
PKG_RELEASE=1
-PKG_SOURCE_MD5SUM_1.0.0:=e54664fdf211d27737e328c4462b545e
+PKG_SOURCE_MD5SUM:=dbc08d311148e095016d9bbf6c7ffda6
PKG_SOURCE_URL:=http://www.musl-libc.org/releases
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
LIBC_SO_VERSION:=$(PKG_VERSION)
-PATCH_DIR:=$(PATH_PREFIX)/patches-$(PKG_VERSION)
-CONFIG_DIR:=$(PATH_PREFIX)/config-$(PKG_VERSION)
+PATCH_DIR:=$(PATH_PREFIX)/patches
HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)-$(PKG_VERSION)
diff --git a/toolchain/musl/patches-1.0.0/100-add_glob_onlydir.patch b/toolchain/musl/patches/100-add_glob_onlydir.patch
index db0bc22afa..db0bc22afa 100644
--- a/toolchain/musl/patches-1.0.0/100-add_glob_onlydir.patch
+++ b/toolchain/musl/patches/100-add_glob_onlydir.patch