aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-03-20 13:51:32 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-03-20 13:51:32 +0000
commit64e3f5f510072fffe8a238edc15163b89a6002f8 (patch)
tree722458b536d804e2e334ad735c9b5fba5dabc929
parentc6019944e30296383137f5406843f2a31b4a856b (diff)
downloadmaster-187ad058-64e3f5f510072fffe8a238edc15163b89a6002f8.tar.gz
master-187ad058-64e3f5f510072fffe8a238edc15163b89a6002f8.tar.bz2
master-187ad058-64e3f5f510072fffe8a238edc15163b89a6002f8.zip
musl: update to 1.0.0
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39962 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--toolchain/musl/Config.in8
-rw-r--r--toolchain/musl/Config.version4
-rw-r--r--toolchain/musl/Makefile2
-rw-r--r--toolchain/musl/common.mk2
-rw-r--r--toolchain/musl/patches-0.9.15/100-in_h_are_4_equal_parenthesis.patch11
-rw-r--r--toolchain/musl/patches-0.9.15/110-syslog_log_upto_parenthesis.patch11
-rw-r--r--toolchain/musl/patches-1.0.0/100-add_glob_onlydir.patch (renamed from toolchain/musl/patches-0.9.15/120-add_glob_onlydir.patch)0
7 files changed, 8 insertions, 30 deletions
diff --git a/toolchain/musl/Config.in b/toolchain/musl/Config.in
index 4049f24664..8892af01a1 100644
--- a/toolchain/musl/Config.in
+++ b/toolchain/musl/Config.in
@@ -3,13 +3,13 @@
choice
prompt "musl Version"
depends on TOOLCHAINOPTS && USE_MUSL
- default MUSL_USE_VERSION_0_9_15
+ default MUSL_USE_VERSION_1_0_0
help
Select the version of musl you wish to use.
- config MUSL_USE_VERSION_0_9_15
- select MUSL_VERSION_0_9_15
- bool "musl 0.9.15"
+ config MUSL_USE_VERSION_1_0_0
+ select MUSL_VERSION_1_0_0
+ bool "musl 1.0.0"
endchoice
diff --git a/toolchain/musl/Config.version b/toolchain/musl/Config.version
index b88bf65bae..685aef2b9d 100644
--- a/toolchain/musl/Config.version
+++ b/toolchain/musl/Config.version
@@ -3,9 +3,9 @@ if USE_MUSL
config MUSL_VERSION
string
depends on USE_MUSL
- default "0.9.15" if MUSL_VERSION_0_9_15
+ default "1.0.0" if MUSL_VERSION_1_0_0
-config MUSL_VERSION_0_9_15
+config MUSL_VERSION_1_0_0
default y if !TOOLCHAINOPTS
bool
diff --git a/toolchain/musl/Makefile b/toolchain/musl/Makefile
index 66b874eb2e..35f160db36 100644
--- a/toolchain/musl/Makefile
+++ b/toolchain/musl/Makefile
@@ -19,7 +19,7 @@ define Host/SetToolchainInfo
endef
define Host/Compile
- $(MAKE) $(HOST_JOBS) $(MUSL_MAKEOPTS) all
+ +$(MAKE) $(HOST_JOBS) $(MUSL_MAKEOPTS) all
endef
define Host/Install
diff --git a/toolchain/musl/common.mk b/toolchain/musl/common.mk
index 538ad270e5..e974d28fb9 100644
--- a/toolchain/musl/common.mk
+++ b/toolchain/musl/common.mk
@@ -11,7 +11,7 @@ PKG_NAME:=musl
PKG_VERSION:=$(call qstrip,$(CONFIG_MUSL_VERSION))
PKG_RELEASE=1
-PKG_SOURCE_MD5SUM_0.9.15:=06f590a38c85722ee9343db2416425f4
+PKG_SOURCE_MD5SUM_1.0.0:=e54664fdf211d27737e328c4462b545e
PKG_SOURCE_URL:=http://www.musl-libc.org/releases
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/toolchain/musl/patches-0.9.15/100-in_h_are_4_equal_parenthesis.patch b/toolchain/musl/patches-0.9.15/100-in_h_are_4_equal_parenthesis.patch
deleted file mode 100644
index b77f650d0d..0000000000
--- a/toolchain/musl/patches-0.9.15/100-in_h_are_4_equal_parenthesis.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/include/netinet/in.h
-+++ b/include/netinet/in.h
-@@ -149,7 +149,7 @@ uint16_t ntohs(uint16_t);
- (IN6_IS_ADDR_MULTICAST(a) && ((((uint8_t *) (a))[1] & 0xf) == 0xe))
-
- #define __ARE_4_EQUAL(a,b) \
-- (!( 0[a]-0[b] | 1[a]-1[b] | 2[a]-2[b] | 3[a]-3[b] ))
-+ (!( (0[a]-0[b]) | (1[a]-1[b]) | (2[a]-2[b]) | (3[a]-3[b]) ))
- #define IN6_ARE_ADDR_EQUAL(a,b) \
- __ARE_4_EQUAL((const uint32_t *)(a), (const uint32_t *)(b))
-
diff --git a/toolchain/musl/patches-0.9.15/110-syslog_log_upto_parenthesis.patch b/toolchain/musl/patches-0.9.15/110-syslog_log_upto_parenthesis.patch
deleted file mode 100644
index 840dd40132..0000000000
--- a/toolchain/musl/patches-0.9.15/110-syslog_log_upto_parenthesis.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/include/syslog.h
-+++ b/include/syslog.h
-@@ -21,7 +21,7 @@ extern "C" {
- #define LOG_MAKEPRI(f, p) (((f)<<3)|(p))
-
- #define LOG_MASK(p) (1<<(p))
--#define LOG_UPTO(p) ((1<<(p)+1)-1)
-+#define LOG_UPTO(p) ((1<<((p)+1))-1)
-
- #define LOG_KERN (0<<3)
- #define LOG_USER (1<<3)
diff --git a/toolchain/musl/patches-0.9.15/120-add_glob_onlydir.patch b/toolchain/musl/patches-1.0.0/100-add_glob_onlydir.patch
index db0bc22afa..db0bc22afa 100644
--- a/toolchain/musl/patches-0.9.15/120-add_glob_onlydir.patch
+++ b/toolchain/musl/patches-1.0.0/100-add_glob_onlydir.patch