diff --git a/toolchain/musl/common.mk b/toolchain/musl/common.mk index 94444eaf75..35bdfd184b 100644 --- a/toolchain/musl/common.mk +++ b/toolchain/musl/common.mk @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/target.mk PKG_NAME:=musl -PKG_VERSION:=1.2.4 +PKG_VERSION:=1.2.5 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://musl.libc.org/releases/ -PKG_HASH:=7a35eae33d5372a7c0da1188de798726f68825513b7ae3ebe97aaaa52114f039 +PKG_HASH:=a9a118bbe84d8764da0ea0d28b3ab3fae8477fc7e4085d90102b8596fc7c75e4 PKG_CPE_ID:=cpe:/a:musl-libc:musl LIBC_SO_VERSION:=$(PKG_VERSION) diff --git a/toolchain/musl/patches/900-iconv_size_hack.patch b/toolchain/musl/patches/900-iconv_size_hack.patch index 461a204a4c..ad1dc4b109 100644 --- a/toolchain/musl/patches/900-iconv_size_hack.patch +++ b/toolchain/musl/patches/900-iconv_size_hack.patch @@ -6,7 +6,7 @@ "ucs2\0\0\314" +#ifdef FULL_ICONV "eucjp\0\0\320" - "shiftjis\0sjis\0\0\321" + "shiftjis\0sjis\0cp932\0\0\321" "iso2022jp\0\0\322" @@ -56,6 +57,7 @@ static const unsigned char charmaps[] = "gb2312\0\0\332"