From ce1548b92217da68fd2dfe0148a8ac4215495ec0 Mon Sep 17 00:00:00 2001 From: Marco A L Barbosa Date: Fri, 13 Nov 2020 14:51:44 -0300 Subject: [PATCH] Downgrade musl to 1.1.24 Fixes #478. --- CHANGELOG.md | 1 + README.md | 20 ++++++++++---------- docker/musl.sh | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 538b54b1a..d84402d60 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Added support for mounting volumes. - Re-enabled `powerpc64-unknown-linux-gnu` image - Re-enabled `sparc64-unknown-linux-gnu` image +- Bump musl version to 1.1.24. ## [v0.2.1] - 2020-06-30 diff --git a/README.md b/README.md index b30d822dd..a5026991e 100644 --- a/README.md +++ b/README.md @@ -262,30 +262,30 @@ terminate. | `*-apple-ios` [1] | N/A | N/A | N/A | N/A | ✓ | | `aarch64-linux-android` [2] | N/A | 4.9 | ✓ | N/A | ✓ | | `aarch64-unknown-linux-gnu` | 2.19 | 4.8.2 | ✓ | 4.1.0 | ✓ | -| `aarch64-unknown-linux-musl` | 1.1.20 | 6.3.0 | | 4.1.0 | ✓ | +| `aarch64-unknown-linux-musl` | 1.1.24 | 6.3.0 | | 4.1.0 | ✓ | | `arm-linux-androideabi` [2] | N/A | 4.9 | ✓ | N/A | ✓ | | `arm-unknown-linux-gnueabi` | 2.19 | 4.8.2 | ✓ | 4.1.0 | ✓ | | `arm-unknown-linux-gnueabihf` | 2.27 | 7.3.0 | ✓ | 4.1.0 | ✓ | -| `arm-unknown-linux-musleabi` | 1.1.20 | 6.3.0 | | 4.1.0 | ✓ | -| `arm-unknown-linux-musleabihf` | 1.1.20 | 6.3.0 | | 4.1.0 | ✓ | +| `arm-unknown-linux-musleabi` | 1.1.24 | 6.3.0 | | 4.1.0 | ✓ | +| `arm-unknown-linux-musleabihf` | 1.1.24 | 6.3.0 | | 4.1.0 | ✓ | | `armv5te-unknown-linux-gnueabi` | 2.27 | 7.5.0 | ✓ | 4.2.0 | ✓ | -| `armv5te-unknown-linux-musleabi` | 1.1.20 | 6.3.0 | | 4.1.0 | ✓ | +| `armv5te-unknown-linux-musleabi` | 1.1.24 | 6.3.0 | | 4.1.0 | ✓ | | `armv7-linux-androideabi` [2] | N/A | 4.9 | ✓ | N/A | ✓ | | `armv7-unknown-linux-gnueabihf` | 2.15 | 4.6.2 | ✓ | 4.1.0 | ✓ | -| `armv7-unknown-linux-musleabihf` | 1.1.20 | 6.3.0 | | 4.1.0 | ✓ | +| `armv7-unknown-linux-musleabihf` | 1.1.24 | 6.3.0 | | 4.1.0 | ✓ | | `i586-unknown-linux-gnu` | 2.23 | 5.3.1 | ✓ | N/A | ✓ | -| `i586-unknown-linux-musl` | 1.1.20 | 6.3.0 | | N/A | ✓ | +| `i586-unknown-linux-musl` | 1.1.24 | 6.3.0 | | N/A | ✓ | | `i686-unknown-freebsd` [4] | 12.1 | 6.4.0 | | N/A | ✓ | | `i686-linux-android` [2] | N/A | 4.9 | ✓ | N/A | ✓ | | `i686-pc-windows-gnu` | N/A | 7.3.0 | ✓ | N/A | ✓ | | `i686-unknown-linux-gnu` | 2.15 | 4.6.2 | ✓ | N/A | ✓ | -| `i686-unknown-linux-musl` | 1.1.20 | 6.3.0 | | N/A | ✓ | +| `i686-unknown-linux-musl` | 1.1.24 | 6.3.0 | | N/A | ✓ | | `mips-unknown-linux-gnu` | 2.23 | 5.3.1 | ✓ | 4.1.0 | ✓ | -| `mips-unknown-linux-musl` | 1.1.20 | 6.3.0 | ✓ | 4.1.0 | ✓ | +| `mips-unknown-linux-musl` | 1.1.24 | 6.3.0 | ✓ | 4.1.0 | ✓ | | `mips64-unknown-linux-gnuabi64` | 2.23 | 5.3.1 | ✓ | 4.1.0 | ✓ | | `mips64el-unknown-linux-gnuabi64` | 2.23 | 5.3.1 | ✓ | 4.1.0 | ✓ | | `mipsel-unknown-linux-gnu` | 2.23 | 5.3.1 | ✓ | 4.1.0 | ✓ | -| `mipsel-unknown-linux-musl` | 1.1.20 | 6.3.0 | ✓ | 4.1.0 | ✓ | +| `mipsel-unknown-linux-musl` | 1.1.24 | 6.3.0 | ✓ | 4.1.0 | ✓ | | `powerpc-unknown-linux-gnu` | 2.19 | 4.8.2 | ✓ | 3.0.1 | ✓ | | `powerpc64-unknown-linux-gnu` | 2.31 | 10.2.0 | ✓ | 3.0.1 | ✓ | | `powerpc64le-unknown-linux-gnu` | 2.19 | 4.8.2 | ✓ | 3.0.1 | ✓ | @@ -304,7 +304,7 @@ terminate. | `x86_64-unknown-freebsd` [4] | 12.1 | 6.4.0 | | N/A | ✓ | | `x86_64-unknown-dragonfly` [4] [3] | 4.6.0 | 5.3.0 | ✓ | N/A | | | `x86_64-unknown-linux-gnu` | 2.15 | 4.6.2 | ✓ | N/A | ✓ | -| `x86_64-unknown-linux-musl` | 1.1.20 | 6.3.0 | | N/A | ✓ | +| `x86_64-unknown-linux-musl` | 1.1.24 | 6.3.0 | | N/A | ✓ | | `x86_64-unknown-netbsd` [4] | 7.0 | 5.3.0 | ✓ | N/A | | [1] iOS cross compilation is supported on macOS hosts. diff --git a/docker/musl.sh b/docker/musl.sh index 585bce3cf..8094e3f06 100755 --- a/docker/musl.sh +++ b/docker/musl.sh @@ -48,7 +48,7 @@ main() { hide_output make install "-j$(nproc)" \ GCC_VER=9.2.0 \ - MUSL_VER=1.2.0 \ + MUSL_VER=1.1.24 \ BINUTILS_VER=2.33.1 \ DL_CMD='curl --retry 3 -sSfL -C - -o' \ LINUX_HEADERS_SITE=$linux_headers_site \