musl: update to version 1.1.1
authorFelix Fietkau <nbd@openwrt.org>
Wed, 21 May 2014 14:09:58 +0000 (14:09 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Wed, 21 May 2014 14:09:58 +0000 (14:09 +0000)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 40820

toolchain/musl/Config.in
toolchain/musl/Config.version
toolchain/musl/common.mk
toolchain/musl/patches-1.0.0/100-add_glob_onlydir.patch [deleted file]
toolchain/musl/patches/100-add_glob_onlydir.patch [new file with mode: 0644]

index 8892af0..05caa6a 100644 (file)
@@ -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
index 685aef2..7a25126 100644 (file)
@@ -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
index e974d28..93fab04 100644 (file)
@@ -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-1.0.0/100-add_glob_onlydir.patch
deleted file mode 100644 (file)
index db0bc22..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/include/glob.h
-+++ b/include/glob.h
-@@ -31,6 +31,8 @@ void globfree(glob_t *);
- #define GLOB_NOESCAPE 0x40
- #define       GLOB_PERIOD   0x80
-+#define GLOB_ONLYDIR  0x100
-+
- #define GLOB_NOSPACE 1
- #define GLOB_ABORTED 2
- #define GLOB_NOMATCH 3
diff --git a/toolchain/musl/patches/100-add_glob_onlydir.patch b/toolchain/musl/patches/100-add_glob_onlydir.patch
new file mode 100644 (file)
index 0000000..db0bc22
--- /dev/null
@@ -0,0 +1,11 @@
+--- a/include/glob.h
++++ b/include/glob.h
+@@ -31,6 +31,8 @@ void globfree(glob_t *);
+ #define GLOB_NOESCAPE 0x40
+ #define       GLOB_PERIOD   0x80
++#define GLOB_ONLYDIR  0x100
++
+ #define GLOB_NOSPACE 1
+ #define GLOB_ABORTED 2
+ #define GLOB_NOMATCH 3