musl: update to 1.0.0

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 39962
master
Felix Fietkau 11 years ago
parent fbda3388f9
commit 0f474633e1
  1. 8
      toolchain/musl/Config.in
  2. 4
      toolchain/musl/Config.version
  3. 2
      toolchain/musl/Makefile
  4. 2
      toolchain/musl/common.mk
  5. 11
      toolchain/musl/patches-0.9.15/100-in_h_are_4_equal_parenthesis.patch
  6. 11
      toolchain/musl/patches-0.9.15/110-syslog_log_upto_parenthesis.patch
  7. 0
      toolchain/musl/patches-1.0.0/100-add_glob_onlydir.patch

@ -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

@ -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

@ -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

@ -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

@ -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))

@ -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)
Loading…
Cancel
Save