From f969b61bd61d31b4a6f001b7047fd4a192bedd35 Mon Sep 17 00:00:00 2001 From: Marco A L Barbosa Date: Thu, 5 Jul 2018 19:53:36 -0300 Subject: [PATCH] Update musl to 1.1.19 and add patch to fix tls issue --- src/ci/docker/scripts/musl.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/ci/docker/scripts/musl.sh b/src/ci/docker/scripts/musl.sh index f87ba8fe4e60e..4ca7389d6d1a5 100644 --- a/src/ci/docker/scripts/musl.sh +++ b/src/ci/docker/scripts/musl.sh @@ -32,11 +32,17 @@ shift export CFLAGS="-fPIC $CFLAGS" -MUSL=musl-1.1.18 +# FIXME: remove the patch when upate to 1.1.20 +MUSL=musl-1.1.19 # may have been downloaded in a previous run if [ ! -d $MUSL ]; then curl https://www.musl-libc.org/releases/$MUSL.tar.gz | tar xzf - + # Patch to fix https://github.com/rust-lang/rust/issues/48967 + cd $MUSL && \ + curl "https://git.musl-libc.org/cgit/musl/patch/?id=610c5a8524c3d6cd3ac5a5f1231422e7648a3791" |\ + patch -p1 && \ + cd - fi cd $MUSL